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

[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 a629dfce3ca9f0e7f2ea09ef19c133880c917860..e8bc83b03a936a41e37f824daaefa73678eac302 100644 (file)
--- a/test/system/note_comments_test.rb
+++ b/test/system/note_comments_test.rb
@@ -22,7 +22,7 @@ class NoteCommentsTest < ApplicationSystemTestCase
     end
   end
 
     end
   end
 

-  def test_add_comment
+  test "can add comment" do

     note = create(:note_with_comments)
     user = create(:user)
     sign_in_as(user)
     note = create(:note_with_comments)
     user = create(:user)
     sign_in_as(user)


@@ -80,27 +80,48 @@ class NoteCommentsTest < ApplicationSystemTestCase
     end
   end
 
     end
   end
 

-  test "can't resolve a note when blocked" do
+  test "no subscribe button when not logged in" do
+    note = create(:note_with_comments)
+    visit note_path(note)
+
+    within_sidebar do
+      assert_no_button "Subscribe"
+      assert_no_button "Unsubscribe"
+    end
+  end
+
+  test "can subscribe" do

     note = create(:note_with_comments)
     user = create(:user)
     sign_in_as(user)
     visit note_path(note)
     note = create(:note_with_comments)
     user = create(:user)
     sign_in_as(user)
     visit note_path(note)

-    create(:user_block, :user => user)

 
     within_sidebar do
 
     within_sidebar do

-      assert_text "Unresolved note"
-      assert_no_text "Resolved note"
-      assert_no_text "Your access to the API has been blocked"
-      assert_button "Resolve", :disabled => false
-      assert_button "Comment", :disabled => true
+      assert_button "Subscribe"
+      assert_no_button "Unsubscribe"

 
 

-      click_on "Resolve"
+      click_on "Subscribe"

 
 

-      assert_text "Unresolved note"
-      assert_no_text "Resolved note"
-      assert_text "Your access to the API has been blocked"
-      assert_button "Resolve", :disabled => false
-      assert_button "Comment", :disabled => true
+      assert_no_button "Subscribe"
+      assert_button "Unsubscribe"
+    end
+  end
+
+  test "can unsubscribe" do
+    note = create(:note_with_comments)
+    user = create(:user)
+    create(:note_subscription, :note => note, :user => user)
+    sign_in_as(user)
+    visit note_path(note)
+
+    within_sidebar do
+      assert_no_button "Subscribe"
+      assert_button "Unsubscribe"
+
+      click_on "Unsubscribe"
+
+      assert_button "Subscribe"
+      assert_no_button "Unsubscribe"

     end
   end
 end
     end
   end
 end