Merge remote-tracking branch 'upstream/pull/4964'

[rails.git] / test / controllers / preferences_controller_test.rb

diff --git a/test/controllers/preferences_controller_test.rb b/test/controllers/preferences_controller_test.rb
index 46d761ca49d51905312ac126c862c826e17caeb5..81760fe5de54816a88b448dcdd6a47e3ea008a8e 100644 (file)
--- a/test/controllers/preferences_controller_test.rb
+++ b/test/controllers/preferences_controller_test.rb
@@ -36,7 +36,6 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
     # Changing to a valid editor should work
     user.preferred_editor = "id"
     put preferences_path, :params => { :user => user.attributes }
-    assert_response :redirect
     assert_redirected_to preferences_path
     follow_redirect!
     assert_template :show
@@ -46,7 +45,6 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
     # Changing to the default editor should work
     user.preferred_editor = "default"
     put preferences_path, :params => { :user => user.attributes }
-    assert_response :redirect
     assert_redirected_to preferences_path
     follow_redirect!
     assert_template :show