summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/routes.rb2
-rw-r--r--test/integration/routing/my_test.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index ab0ae6f27..625440c8e 100644
--- 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 e08c71c56..585764a0b 100644
--- 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'