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 23f3fc98eecb636f54a0389d925d9a9b0f9d3384..70cfc417c16b5de15235faf7f2415300d790fc1e 100644 (file)
--- a/test/system/note_comments_test.rb
+++ b/test/system/note_comments_test.rb
@@ -1,17 +1,42 @@
 require "application_system_test_case"
 
 class NoteCommentsTest < ApplicationSystemTestCase
 require "application_system_test_case"
 
 class NoteCommentsTest < ApplicationSystemTestCase

-  def test_action_text
+  test "open note has login notice" do

     note = create(:note_with_comments)
     note = create(:note_with_comments)

-    sign_in_as(create(:user))

     visit note_path(note)
 
     visit note_path(note)
 

+    assert_no_button "Resolve"
+    assert_no_button "Comment"
+    assert_link "Log in to comment on this note", :href => login_path(:referer => note_path(note))
+  end
+
+  test "closed note has no login notice" do
+    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_add_comment
+    note = create(:note_with_comments)
+    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
 
     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 & 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
   end
 end