Merge branch 'pull/5218'

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

diff --git a/test/controllers/profiles_controller_test.rb b/test/controllers/profiles_controller_test.rb
index 5b11127c7bb97ed35cc13ca90412ea485d549362..f388349ab3509e30ffd0844e6c64bf6208ac0641 100644 (file)
--- a/test/controllers/profiles_controller_test.rb
+++ b/test/controllers/profiles_controller_test.rb
@@ -21,7 +21,6 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest
 
     # Updating the description should work
     put profile_path, :params => { :user => { :description => "new description" } }
 
     # Updating the description should work
     put profile_path, :params => { :user => { :description => "new description" } }

-    assert_response :redirect

     assert_redirected_to user_path(user)
     follow_redirect!
     assert_response :success
     assert_redirected_to user_path(user)
     follow_redirect!
     assert_response :success


@@ -32,7 +31,6 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest
     # Changing to an uploaded image should work
     image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
     put profile_path, :params => { :avatar_action => "new", :user => { :avatar => image, :description => user.description } }
     # Changing to an uploaded image should work
     image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
     put profile_path, :params => { :avatar_action => "new", :user => { :avatar => image, :description => user.description } }

-    assert_response :redirect

     assert_redirected_to user_path(user)
     follow_redirect!
     assert_response :success
     assert_redirected_to user_path(user)
     follow_redirect!
     assert_response :success


@@ -43,7 +41,6 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest
 
     # Changing to a gravatar image should work
     put profile_path, :params => { :avatar_action => "gravatar", :user => { :description => user.description } }
 
     # Changing to a gravatar image should work
     put profile_path, :params => { :avatar_action => "gravatar", :user => { :description => user.description } }

-    assert_response :redirect

     assert_redirected_to user_path(user)
     follow_redirect!
     assert_response :success
     assert_redirected_to user_path(user)
     follow_redirect!
     assert_response :success


@@ -54,7 +51,6 @@ class ProfilesControllerTest < ActionDispatch::IntegrationTest
 
     # Removing the image should work
     put profile_path, :params => { :avatar_action => "delete", :user => { :description => user.description } }
 
     # Removing the image should work
     put profile_path, :params => { :avatar_action => "delete", :user => { :description => user.description } }

-    assert_response :redirect

     assert_redirected_to user_path(user)
     follow_redirect!
     assert_response :success
     assert_redirected_to user_path(user)
     follow_redirect!
     assert_response :success