diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-07-05 10:29:59 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-07-05 10:29:59 +0000 |
| commit | 5a76b558aeb2eb97ced3e159d222485935888a31 (patch) | |
| tree | 985d480bb9f09b67d3e49b49ff1048a6347c5891 /test | |
| parent | d7230643c8189ced946f496ba9b7983ffcaf090b (diff) | |
| download | redmine-5a76b558aeb2eb97ced3e159d222485935888a31.tar.gz redmine-5a76b558aeb2eb97ced3e159d222485935888a31.zip | |
Merged r14389 (#20203).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14400 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/admin_controller_test.rb | 4 | ||||
| -rw-r--r-- | test/integration/routing/admin_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb index bef3e4284..3064d5faa 100644 --- 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 0fce80395..16e2c1ca1 100644 --- a/test/integration/routing/admin_test.rb +++ b/test/integration/routing/admin_test.rb @@ -23,7 +23,7 @@ class RoutingAdminTest < Redmine::RoutingTest should_route 'GET /admin/projects' => 'admin#projects' should_route 'GET /admin/plugins' => 'admin#plugins' should_route 'GET /admin/info' => 'admin#info' - should_route 'GET /admin/test_email' => 'admin#test_email' + should_route 'POST /admin/test_email' => 'admin#test_email' should_route 'POST /admin/default_configuration' => 'admin#default_configuration' end end |