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

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

diff --git a/test/system/note_comments_test.rb b/test/system/note_comments_test.rb
index 2ad64ccc8fa3f2170adf9154adf3076e03e6311e..70cfc417c16b5de15235faf7f2415300d790fc1e 100644 (file)
--- a/test/system/note_comments_test.rb
+++ b/test/system/note_comments_test.rb
@@ -11,24 +11,32 @@ class NoteCommentsTest < ApplicationSystemTestCase
   end
 
   test "closed note has no login notice" do
-    note = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc)
+    note = create(:note_with_comments, :closed)
     visit note_path(note)
 
     assert_no_button "Reactivate"
     assert_no_link "Log in to comment on this note"
   end
 
-  def test_action_text
+  def test_add_comment
     note = create(:note_with_comments)
-    sign_in_as(create(:user))
+    user = create(:user)
+    sign_in_as(user)
     visit note_path(note)
 
+    assert_no_content "Comment from #{user.display_name}"
+    assert_no_content "Some newly added note comment"
     assert_button "Resolve"
     assert_button "Comment", :disabled => true
 
-    fill_in "text", :with => "Some text"
+    fill_in "text", :with => "Some newly added note comment"
 
     assert_button "Comment & Resolve"
-    assert_button "Comment"
+    assert_button "Comment", :disabled => false
+
+    click_on "Comment"
+
+    assert_content "Comment from #{user.display_name}"
+    assert_content "Some newly added note comment"
   end
 end