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

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

diff --git a/test/system/messages_test.rb b/test/system/messages_test.rb
index 60011e4d6674a822970472f8c1e7744236da68bf..0b828971895ecacdefb4d3e11e508eaa692a7cf7 100644 (file)
--- a/test/system/messages_test.rb
+++ b/test/system/messages_test.rb
@@ -6,10 +6,10 @@ class MessagesTest < ApplicationSystemTestCase
     create(:message, :recipient => user)
     sign_in_as(user)
 
-    visit inbox_messages_path
+    visit messages_inbox_path
     assert_text "You have 1 new message and 0 old messages"
 
-    click_button "Delete"
+    click_on "Delete"
     assert_text "You have 0 new messages and 0 old messages"
   end
 
@@ -18,10 +18,10 @@ class MessagesTest < ApplicationSystemTestCase
     create(:message, :sender => user)
     sign_in_as(user)
 
-    visit outbox_messages_path
+    visit messages_outbox_path
     assert_text "You have 1 sent message"
 
-    click_button "Delete"
+    click_on "Delete"
     assert_text "You have 0 sent messages"
   end
 
@@ -32,10 +32,11 @@ class MessagesTest < ApplicationSystemTestCase
     create(:message, :sender => muted_user, :recipient => user)
     sign_in_as(user)
 
-    visit muted_messages_path
+    visit messages_muted_inbox_path
     assert_text "1 muted message"
 
-    click_button "Delete"
-    assert_text "0 muted messages"
+    click_on "Delete"
+    refute_text "1 muted message"
+    assert_text "You have 0 new messages and 0 old messages"
   end
 end