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

[rails.git] / test / system / user_blocks_test.rb

diff --git a/test/system/user_blocks_test.rb b/test/system/user_blocks_test.rb
index b4b7ada7aa947414407254b92f7b15ac91304eeb..52fe3bc3dc7d364b90df311e498c63dfd4bc57d9 100644 (file)
--- a/test/system/user_blocks_test.rb
+++ b/test/system/user_blocks_test.rb
@@ -31,7 +31,7 @@ class UserBlocksSystemTest < ApplicationSystemTestCase
     blocked_user = create(:user)
     sign_in_as(create(:moderator_user))
 
-    visit revoke_all_user_blocks_path(blocked_user)
+    visit edit_user_received_blocks_path(blocked_user)
     assert_title "Revoking all blocks on #{blocked_user.display_name}"
     assert_text "Revoking all blocks on #{blocked_user.display_name}"
     assert_no_button "Revoke!"
@@ -111,7 +111,7 @@ class UserBlocksSystemTest < ApplicationSystemTestCase
     assert_no_field "Needs view"
 
     fill_in "Reason", :with => "Revoking 0-hour blocks works"
-    click_on "Update block"
+    click_on "Revoke block"
     assert_text(/Revoker:\s+#{Regexp.escape other_moderator_user.display_name}/)
     assert_text(/Status:\s+Ended/)
     assert_text(/Reason for block:\s+Revoking 0-hour blocks works/)