Changed /my/show_api_key route to /my/api_key (#19851).

git-svn-id: http://svn.redmine.org/redmine/trunk@14334 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/routes.rb b/config/routes.rb
index ab0ae6f27d060de0d857bc5452400dd2dea97558..625440c8eedf29e291cc4ff9a68e8193e5381652 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,7 +67,7 @@ Rails.application.routes.draw do
   match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
   match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
   match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
-  match 'my/show_api_key', :controller => 'my', :action => 'show_api_key', :via => :get
+  match 'my/api_key', :controller => 'my', :action => 'show_api_key', :via => :get
   match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
   match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
   match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post

diff --git a/test/integration/routing/my_test.rb b/test/integration/routing/my_test.rb
index e08c71c560f7a0e32fb269075ba7716a5799b970..585764a0bc0909a98540652cb61d51d19c14c80c 100644 (file)
--- a/test/integration/routing/my_test.rb
+++ b/test/integration/routing/my_test.rb
@@ -30,6 +30,7 @@ class RoutingMyTest < Redmine::RoutingTest
 
     should_route 'POST /my/reset_rss_key' => 'my#reset_rss_key'
     should_route 'POST /my/reset_api_key' => 'my#reset_api_key'
+    should_route 'GET /my/api_key' => 'my#show_api_key'
 
     should_route 'GET /my/password' => 'my#password'
     should_route 'POST /my/password' => 'my#password'