Move blocked resolve/reactivate tests to ResolveNoteTest

diff --git a/test/system/note_comments_test.rb b/test/system/note_comments_test.rb
index 0577992f277432f631f36e13358f8fc78daaf5ee..e8bc83b03a936a41e37f824daaefa73678eac302 100644 (file)
--- a/test/system/note_comments_test.rb
+++ b/test/system/note_comments_test.rb
@@ -80,52 +80,6 @@ class NoteCommentsTest < ApplicationSystemTestCase
     end
   end
 
     end
   end
 

-  test "can't resolve a note when blocked" 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
-
-      click_on "Resolve"
-
-      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
-    end
-  end
-
-  test "can't reactivate a note when blocked" do
-    note = create(:note_with_comments, :closed)
-    user = create(: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
-
-      click_on "Reactivate"
-
-      assert_no_text "Unresolved note"
-      assert_text "Resolved note"
-      assert_text "Your access to the API has been blocked"
-      assert_button "Reactivate", :disabled => false
-    end
-  end
-

   test "no subscribe button when not logged in" do
     note = create(:note_with_comments)
     visit note_path(note)
   test "no subscribe button when not logged in" do
     note = create(:note_with_comments)
     visit note_path(note)

diff --git a/test/system/resolve_note_test.rb b/test/system/resolve_note_test.rb
index f9152d99be98c8fdb639e4f44c01bd84c6b91353..7f47e45e25543cc46c6c780b69049cea64f1d648 100644 (file)
--- a/test/system/resolve_note_test.rb
+++ b/test/system/resolve_note_test.rb
@@ -57,4 +57,50 @@ class ResolveNoteTest < ApplicationSystemTestCase
       assert_no_content "<iframe" # leak from share textarea
     end
   end
       assert_no_content "<iframe" # leak from share textarea
     end
   end

+
+  test "can't resolve a note when blocked" 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
+
+      click_on "Resolve"
+
+      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
+    end
+  end
+
+  test "can't reactivate a note when blocked" do
+    note = create(:note_with_comments, :closed)
+    user = create(: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
+
+      click_on "Reactivate"
+
+      assert_no_text "Unresolved note"
+      assert_text "Resolved note"
+      assert_text "Your access to the API has been blocked"
+      assert_button "Reactivate", :disabled => false
+    end
+  end

 end
 end