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

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

diff --git a/test/system/user_muting_test.rb b/test/system/user_muting_test.rb
index ce4346115694d4e6e99a44c35ebd6b7abe5f5527..e70005e647abad142dddac009d1ec0bb477a1a18 100644 (file)
--- a/test/system/user_muting_test.rb
+++ b/test/system/user_muting_test.rb
@@ -10,14 +10,14 @@ class UserMutingTest < ApplicationSystemTestCase
     sign_in_as(user)
 
     visit user_path(other_user)
     sign_in_as(user)
 
     visit user_path(other_user)

-    click_link "Mute this User"
+    click_on "Mute this User"

     assert_content "You muted #{other_user.display_name}"
 
     visit edit_account_path
     assert_content "Muted Users"
     assert_content "You muted #{other_user.display_name}"
 
     visit edit_account_path
     assert_content "Muted Users"

-    click_link "Muted Users"
+    click_on "Muted Users"

     assert_content "You have muted 1 User"
     assert_content "You have muted 1 User"

-    click_link "Unmute"
+    click_on "Unmute"

 
     assert_content "You unmuted #{other_user.display_name}"
     refute_content "Muted Users"
 
     assert_content "You unmuted #{other_user.display_name}"
     refute_content "Muted Users"


@@ -35,7 +35,7 @@ class UserMutingTest < ApplicationSystemTestCase
     fill_in "Body", :with => "some message"
 
     assert_no_emails do
     fill_in "Body", :with => "some message"
 
     assert_no_emails do

-      click_button "Send"
+      click_on "Send"

     end
 
     message = Message.find_by(:sender => muted_user, :recipient => user)
     end
 
     message = Message.find_by(:sender => muted_user, :recipient => user)