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

openstreetmap · Mar 3, 2024 · e0d0b68 · e0d0b68
2 parents fad9a10 + bde2faa
commit e0d0b68
Show file tree

Hide file tree

Showing 29 changed files with 0 additions and 368 deletions.
diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
@@ -25,7 +25,6 @@ def test_account
     # Make sure that you are redirected to the login page when
     # you are not logged in
     get edit_account_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => "/account/edit")
 
     # Make sure we get the page when we are logged in as the right user
@@ -49,10 +48,8 @@ def test_account
 
     # Adding external authentication should redirect to the auth provider
     patch account_path, :params => { :user => user.attributes.merge(:auth_provider => "google") }
-    assert_response :redirect
     assert_redirected_to auth_path(:provider => "google", :origin => "/account")
     follow_redirect!
-    assert_response :redirect
     assert_redirected_to %r{^https://accounts.google.com/o/oauth2/auth\?.*}
 
     # Changing name to one that exists should fail
@@ -74,7 +71,6 @@ def test_account
     # Changing name to one that doesn't exist should work
     new_attributes = user.attributes.dup.merge(:display_name => "new tester")
     patch account_path, :params => { :user => new_attributes }
-    assert_response :redirect
     assert_redirected_to edit_account_url
     get edit_account_path
     assert_response :success
@@ -116,7 +112,6 @@ def test_account
         patch account_path, :params => { :user => user.attributes }
       end
     end
-    assert_response :redirect
     assert_redirected_to edit_account_url
     get edit_account_path
     assert_response :success
@@ -135,7 +130,6 @@ def test_private_account
     # Make sure that you are redirected to the login page when
     # you are not logged in
     get edit_account_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => "/account/edit")
 
     # Make sure we get the page when we are logged in as the right user

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
@@ -184,7 +184,6 @@ def test_index_friends
     _changeset2 = create(:changeset, :user => create(:user), :num_changes => 1)
 
     get friend_changesets_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => friend_changesets_path)
 
     session_for(private_user)
@@ -210,7 +209,6 @@ def test_index_nearby
     _changeset2 = create(:changeset, :user => far_away_user, :num_changes => 1)
 
     get nearby_changesets_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => nearby_changesets_path)
 
     session_for(private_user)
@@ -397,7 +395,6 @@ def test_feed_user_not_found
   # Check that we can't request later pages of the changesets feed
   def test_feed_max_id
     get history_feed_path(:format => "atom", :max_id => 100)
-    assert_response :redirect
     assert_redirected_to :action => :feed
   end
 
@@ -408,7 +405,6 @@ def test_subscribe_page
     path = changeset_subscribe_path(changeset)
 
     get path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => path)
 
     session_for(other_user)
@@ -429,7 +425,6 @@ def test_subscribe_success
     assert_difference "changeset.subscribers.count", 1 do
       post changeset_subscribe_path(changeset)
     end
-    assert_response :redirect
     assert_redirected_to changeset_path(changeset)
     assert changeset.reload.subscribed?(other_user)
   end
@@ -466,7 +461,6 @@ def test_unsubscribe_page
     path = changeset_unsubscribe_path(changeset)
 
     get path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => path)
 
     session_for(other_user)
@@ -489,7 +483,6 @@ def test_unsubscribe_success
     assert_difference "changeset.subscribers.count", -1 do
       post changeset_unsubscribe_path(changeset)
     end
-    assert_response :redirect
     assert_redirected_to changeset_path(changeset)
     assert_not changeset.reload.subscribed?(other_user)
   end

diff --git a/test/controllers/confirmations_controller_test.rb b/test/controllers/confirmations_controller_test.rb
@@ -64,7 +64,6 @@ def test_confirm_get_already_confirmed
 
     # Now try to get the confirmation page again
     get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
-    assert_response :redirect
     assert_redirected_to root_path
   end
 
@@ -191,7 +190,6 @@ def test_confirm_deleted
 
     # Get the confirmation page
     get user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
-    assert_response :redirect
     assert_redirected_to root_path
 
     # Confirm the user
@@ -211,7 +209,6 @@ def test_confirm_resend_success
       end
     end
 
-    assert_response :redirect
     assert_redirected_to login_path
     assert_equal("confirmations/resend_success_flash", flash[:notice][:partial])
     assert_equal({ :email => user.email, :sender => Settings.email_from }, flash[:notice][:locals])
@@ -234,7 +231,6 @@ def test_confirm_resend_no_token
       end
     end
 
-    assert_response :redirect
     assert_redirected_to login_path
     assert_match "User #{user.display_name} not found.", flash[:error]
   end
@@ -252,7 +248,6 @@ def test_confirm_resend_deleted
       end
     end
 
-    assert_response :redirect
     assert_redirected_to login_path
     assert_match "User #{user.display_name} not found.", flash[:error]
   end
@@ -264,7 +259,6 @@ def test_confirm_resend_unknown_user
       end
     end
 
-    assert_response :redirect
     assert_redirected_to login_path
     assert_match "User No Such User not found.", flash[:error]
   end
@@ -284,7 +278,6 @@ def test_confirm_email_success
     confirm_string = user.generate_token_for(:new_email)
 
     post user_confirm_email_path, :params => { :confirm_string => confirm_string }
-    assert_response :redirect
     assert_redirected_to edit_account_path
     assert_match(/Confirmed your change of email address/, flash[:notice])
   end
@@ -294,14 +287,12 @@ def test_confirm_email_already_confirmed
     confirm_string = user.generate_token_for(:new_email)
 
     post user_confirm_email_path, :params => { :confirm_string => confirm_string }
-    assert_response :redirect
     assert_redirected_to edit_account_path
     assert_match(/already been confirmed/, flash[:error])
   end
 
   def test_confirm_email_bad_token
     post user_confirm_email_path, :params => { :confirm_string => "XXXXX" }
-    assert_response :redirect
     assert_redirected_to edit_account_path
     assert_match(/confirmation code has expired or does not exist/, flash[:error])
   end
@@ -318,7 +309,6 @@ def test_gravatar_auto_enable
     # precondition gravatar should be turned off
     assert_not user.image_use_gravatar
     post user_confirm_email_path, :params => { :confirm_string => confirm_string }
-    assert_response :redirect
     assert_redirected_to edit_account_path
     assert_match(/Confirmed your change of email address/, flash[:notice])
     # gravatar use should now be enabled
@@ -333,7 +323,6 @@ def test_gravatar_auto_disable
     # precondition gravatar should be turned on
     assert user.image_use_gravatar
     post user_confirm_email_path, :params => { :confirm_string => confirm_string }
-    assert_response :redirect
     assert_redirected_to edit_account_path
     assert_match(/Confirmed your change of email address/, flash[:notice])
     # gravatar use should now be disabled

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
@@ -120,7 +120,6 @@ def test_new_no_login
     # Make sure that you are redirected to the login page when you
     # are not logged in
     get new_diary_entry_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => "/diary/new")
   end
 
@@ -184,7 +183,6 @@ def test_create
                               :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
                                                 :longitude => "2.2", :language_code => "en" })
     end
-    assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
@@ -211,7 +209,6 @@ def test_create_german
                               :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
                                                 :longitude => "2.2", :language_code => "de" })
     end
-    assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
@@ -240,7 +237,6 @@ def test_new_spammy
       post diary_entries_path(:commit => "save",
                               :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" })
     end
-    assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
@@ -251,7 +247,6 @@ def test_new_spammy
 
     # Follow the redirect
     get diary_entries_path(:display_name => user.display_name)
-    assert_response :redirect
     assert_redirected_to :controller => :users, :action => :suspended
   end
 
@@ -264,15 +259,13 @@ def test_edit
     # Make sure that you are redirected to the login page when you are
     # not logged in, without and with the id of the entry you want to edit
     get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry)
-    assert_response :redirect
     assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit")
 
     session_for(other_user)
 
     # Verify that you get redirected to show if you are not the user
     # that created the entry
     get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry)
-    assert_response :redirect
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
 
     session_for(entry.user)
@@ -315,7 +308,6 @@ def test_edit
     put diary_entry_path(:display_name => entry.user.display_name, :id => entry, :commit => "save",
                          :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude,
                                            :longitude => new_longitude, :language_code => new_language_code })
-    assert_response :redirect
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
 
     # Now check that the new data is rendered, when logged in
@@ -407,7 +399,6 @@ def test_comment
         end
       end
     end
-    assert_response :redirect
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [user.email], email.to
@@ -450,7 +441,6 @@ def test_comment_spammy
         end
       end
     end
-    assert_response :redirect
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [user.email], email.to
@@ -466,7 +456,6 @@ def test_comment_spammy
 
     # Follow the redirect
     get diary_entries_path(:display_name => user.display_name)
-    assert_response :redirect
     assert_redirected_to :controller => :users, :action => :suspended
 
     # Now show the diary entry, and check the new comment is not present
@@ -512,7 +501,6 @@ def test_index_friends
 
     # Try a list of diary entries for your friends when not logged in
     get friends_diary_entries_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => "/diary/friends")
 
     # Try a list of diary entries for your friends when logged in
@@ -532,7 +520,6 @@ def test_index_nearby
 
     # Try a list of diary entries for nearby users when not logged in
     get nearby_diary_entries_path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => "/diary/nearby")
 
     # Try a list of diary entries for nearby users when logged in
@@ -767,14 +754,12 @@ def test_hide
     # Now try as a normal user
     session_for(user)
     post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
-    assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
     assert DiaryEntry.find(diary_entry.id).visible
 
     # Now try as a moderator
     session_for(create(:moderator_user))
     post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
-    assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
     assert_not DiaryEntry.find(diary_entry.id).visible
 
@@ -784,7 +769,6 @@ def test_hide
     # Finally try as an administrator
     session_for(create(:administrator_user))
     post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
-    assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
     assert_not DiaryEntry.find(diary_entry.id).visible
   end
@@ -801,14 +785,12 @@ def test_unhide
     # Now try as a normal user
     session_for(user)
     post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
-    assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_not DiaryEntry.find(diary_entry.id).visible
 
     # Now try as a moderator
     session_for(create(:moderator_user))
     post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
-    assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
     assert DiaryEntry.find(diary_entry.id).visible
 
@@ -818,7 +800,6 @@ def test_unhide
     # Finally try as an administrator
     session_for(create(:administrator_user))
     post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
-    assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
     assert DiaryEntry.find(diary_entry.id).visible
   end
@@ -836,14 +817,12 @@ def test_hidecomment
     # Now try as a normal user
     session_for(user)
     post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
-    assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
     assert DiaryComment.find(diary_comment.id).visible
 
     # Try as a moderator
     session_for(create(:moderator_user))
     post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
-    assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     assert_not DiaryComment.find(diary_comment.id).visible
 
@@ -853,7 +832,6 @@ def test_hidecomment
     # Finally try as an administrator
     session_for(create(:administrator_user))
     post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
-    assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     assert_not DiaryComment.find(diary_comment.id).visible
   end
@@ -871,14 +849,12 @@ def test_unhidecomment
     # Now try as a normal user
     session_for(user)
     post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
-    assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_not DiaryComment.find(diary_comment.id).visible
 
     # Now try as a moderator
     session_for(create(:moderator_user))
     post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
-    assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     assert DiaryComment.find(diary_comment.id).visible
 
@@ -888,7 +864,6 @@ def test_unhidecomment
     # Finally try as an administrator
     session_for(create(:administrator_user))
     post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
-    assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     assert DiaryComment.find(diary_comment.id).visible
   end
@@ -931,7 +906,6 @@ def test_subscribe_page
     path = diary_entry_subscribe_path(:id => diary_entry, :display_name => user.display_name)
 
     get path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => path)
 
     session_for(other_user)
@@ -987,7 +961,6 @@ def test_unsubscribe_page
     path = diary_entry_unsubscribe_path(:id => diary_entry, :display_name => user.display_name)
 
     get path
-    assert_response :redirect
     assert_redirected_to login_path(:referer => path)
 
     session_for(other_user)