Download as
Browse Code »

Commit b1a80523984a74ee9d9926ebf7d1b93292a5ad89

Authored by AntonioTerceiro
1 parent dd793a00
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem78: using new_password instead of change_password 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@638 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
config/routes.rb
  Diff comments   View file @b1a8052
@@ -19,7 +19,7 @@ ActionController::Routing::Routes.draw do |map| @@ -19,7 +19,7 @@ ActionController::Routing::Routes.draw do |map|
19 map.connect 'doc', :controller => 'doc' 19 map.connect 'doc', :controller => 'doc'
20 20
21 # user account controller 21 # user account controller
22 - map.connect 'account/change_password/:code', :controller => 'account', :action => 'change_password' 22 + map.connect 'account/new_password/:code', :controller => 'account', :action => 'new_password'
23 23
24 map.connect 'account/:action', :controller => 'account' 24 map.connect 'account/:action', :controller => 'account'
25 25
test/integration/routing_test.rb
  Diff comments   View file @b1a8052
@@ -21,8 +21,8 @@ class RoutingTest < ActionController::IntegrationTest @@ -21,8 +21,8 @@ class RoutingTest < ActionController::IntegrationTest
21 assert_routing('/account', :controller => 'account', :action => 'index') 21 assert_routing('/account', :controller => 'account', :action => 'index')
22 end 22 end
23 23
24 - def test_change_password  
25 - assert_routing('/account/change_password/90dfhga7sadgd0as6saas', :controller => 'account', :action => 'change_password', :code => '90dfhga7sadgd0as6saas') 24 + def test_new_password
  25 + assert_routing('/account/new_password/90dfhga7sadgd0as6saas', :controller => 'account', :action => 'new_password', :code => '90dfhga7sadgd0as6saas')
26 end 26 end
27 27
28 def test_comatose_admin 28 def test_comatose_admin