diff --git a/config/routes.rb b/config/routes.rb index fc15bdb..a0a6e55 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,7 @@ ActionController::Routing::Routes.draw do |map| map.connect 'doc', :controller => 'doc' # user account controller - map.connect 'account/change_password/:code', :controller => 'account', :action => 'change_password' + map.connect 'account/new_password/:code', :controller => 'account', :action => 'new_password' map.connect 'account/:action', :controller => 'account' diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 7ea14d4..640e823 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -21,8 +21,8 @@ class RoutingTest < ActionController::IntegrationTest assert_routing('/account', :controller => 'account', :action => 'index') end - def test_change_password - assert_routing('/account/change_password/90dfhga7sadgd0as6saas', :controller => 'account', :action => 'change_password', :code => '90dfhga7sadgd0as6saas') + def test_new_password + assert_routing('/account/new_password/90dfhga7sadgd0as6saas', :controller => 'account', :action => 'new_password', :code => '90dfhga7sadgd0as6saas') end def test_comatose_admin -- libgit2 0.21.2