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

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

diff --git a/test/system/messages_test.rb b/test/system/messages_test.rb
index 87021dd6b99744ed472904e42e2ae166d37e0704..b78568314166ab4e357f16841008a970848290ad 100644 (file)
--- a/test/system/messages_test.rb
+++ b/test/system/messages_test.rb
@@ -1,6 +1,6 @@
 require "application_system_test_case"
 
 require "application_system_test_case"
 

-class NoteCommentsTest < ApplicationSystemTestCase
+class MessagesTest < ApplicationSystemTestCase

   def test_delete_received_message
     user = create(:user)
     create(:message, :recipient => user)
   def test_delete_received_message
     user = create(:user)
     create(:message, :recipient => user)


@@ -9,7 +9,7 @@ class NoteCommentsTest < ApplicationSystemTestCase
     visit inbox_messages_path
     assert_text "You have 1 new message and 0 old messages"
 
     visit inbox_messages_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
 
     assert_text "You have 0 new messages and 0 old messages"
   end
 


@@ -21,7 +21,7 @@ class NoteCommentsTest < ApplicationSystemTestCase
     visit outbox_messages_path
     assert_text "You have 1 sent message"
 
     visit outbox_messages_path
     assert_text "You have 1 sent message"
 

-    click_button "Delete"
+    click_on "Delete"

     assert_text "You have 0 sent messages"
   end
 
     assert_text "You have 0 sent messages"
   end
 


@@ -35,7 +35,8 @@ class NoteCommentsTest < ApplicationSystemTestCase
     visit muted_messages_path
     assert_text "1 muted message"
 
     visit muted_messages_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
   end
 end