Merged r14389 (#20203).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14402 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb
index f746f7cedbcfaf9e32ff9f5b12e5bd0df4d59640..59a30a9a8d2dfd3796dfa5445f49261222242612 100644 (file)
--- a/app/views/settings/_notifications.html.erb
+++ b/app/views/settings/_notifications.html.erb
@@ -30,7 +30,7 @@
 </fieldset>
 
 <div style="float:right;">
-<%= link_to l(:label_send_test_email), :controller => 'admin', :action => 'test_email' %>
+<%= link_to l(:label_send_test_email), { :controller => 'admin', :action => 'test_email' }, :method => :post %>
 </div>
 
 <%= submit_tag l(:button_save) %>

diff --git a/config/routes.rb b/config/routes.rb
index ad6a4caee5cf5216d2a901069a23e029b12539fd..1eb9e66d7639ceafbaad461a45fe6137c2a3109b 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -308,7 +308,7 @@ RedmineApp::Application.routes.draw do
   match 'admin/projects', :controller => 'admin', :action => 'projects', :via => :get
   match 'admin/plugins', :controller => 'admin', :action => 'plugins', :via => :get
   match 'admin/info', :controller => 'admin', :action => 'info', :via => :get
-  match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :get
+  match 'admin/test_email', :controller => 'admin', :action => 'test_email', :via => :post
   match 'admin/default_configuration', :controller => 'admin', :action => 'default_configuration', :via => :post
 
   resources :auth_sources do

diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index d38b5305e69c831c86ec3a70fccfdda925a67a65..e937047470fddd632ec211d1bed01a56b2851e2c 100644 (file)
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -87,7 +87,7 @@ class AdminControllerTest < ActionController::TestCase
     user.pref.save!
     ActionMailer::Base.deliveries.clear
 
-    get :test_email
+    post :test_email
     assert_redirected_to '/settings?tab=notifications'
     mail = ActionMailer::Base.deliveries.last
     assert_not_nil mail
@@ -97,7 +97,7 @@ class AdminControllerTest < ActionController::TestCase
 
   def test_test_email_failure_should_display_the_error
     Mailer.stubs(:test_email).raises(Exception, 'Some error message')
-    get :test_email
+    post :test_email
     assert_redirected_to '/settings?tab=notifications'
     assert_match /Some error message/, flash[:error]
   end

diff --git a/test/integration/routing/admin_test.rb b/test/integration/routing/admin_test.rb
index 7efa51ad056e45b7f426553dc446145b162ef156..a6431ebdc0f0464903c82c7e54842029db0b1079 100644 (file)
--- a/test/integration/routing/admin_test.rb
+++ b/test/integration/routing/admin_test.rb
@@ -36,7 +36,7 @@ class RoutingAdminTest < ActionController::IntegrationTest
         { :controller => 'admin', :action => 'info' }
       )
     assert_routing(
-        { :method => 'get', :path => "/admin/test_email" },
+        { :method => 'post', :path => "/admin/test_email" },
         { :controller => 'admin', :action => 'test_email' }
       )
     assert_routing(