X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c3498b490b7e695f0be0898e3df76961bda4738e..bb561d3ea9441b9a1c9032a80d751b640ddd2a23:/test/system/note_comments_test.rb

diff --git a/test/system/note_comments_test.rb b/test/system/note_comments_test.rb
index 7c830cc37..e8bc83b03 100644
--- a/test/system/note_comments_test.rb
+++ b/test/system/note_comments_test.rb
@@ -22,7 +22,7 @@ class NoteCommentsTest < ApplicationSystemTestCase
     end
   end
 
-  def test_add_comment
+  test "can add comment" do
     note = create(:note_with_comments)
     user = create(:user)
     sign_in_as(user)
@@ -80,49 +80,48 @@ class NoteCommentsTest < ApplicationSystemTestCase
     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)
-    create(:user_block, :user => user)
 
     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't reactivate a note when blocked" do
-    note = create(:note_with_comments, :closed)
+  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)
-    create(:user_block, :user => user)
 
     within_sidebar do
-      assert_no_text "Unresolved note"
-      assert_text "Resolved note"
-      assert_no_text "Your access to the API has been blocked"
-      assert_button "Reactivate", :disabled => false
+      assert_no_button "Subscribe"
+      assert_button "Unsubscribe"
 
-      click_on "Reactivate"
+      click_on "Unsubscribe"
 
-      assert_no_text "Unresolved note"
-      assert_text "Resolved note"
-      assert_text "Your access to the API has been blocked"
-      assert_button "Reactivate", :disabled => false
+      assert_button "Subscribe"
+      assert_no_button "Unsubscribe"
     end
   end
 end