X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6272b041c6dd9c39cc7a23d6163651e74509da2b..8e54d0f2aeaad8648a60e4685fa64380c45c5631:/test/system/note_comments_test.rb diff --git a/test/system/note_comments_test.rb b/test/system/note_comments_test.rb index aa548059f..7c830cc37 100644 --- a/test/system/note_comments_test.rb +++ b/test/system/note_comments_test.rb @@ -5,30 +5,124 @@ class NoteCommentsTest < ApplicationSystemTestCase note = create(:note_with_comments) 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)) + within_sidebar do + 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 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" + within_sidebar do + assert_no_button "Reactivate" + assert_no_link "Log in to comment on this note" + end 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_button "Resolve" - assert_button "Comment", :disabled => true + within_sidebar do + 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 & Resolve" + assert_button "Comment", :disabled => false + + click_on "Comment" + + assert_content "Comment from #{user.display_name}" + assert_content "Some newly added note comment" + end + end + + test "can't add a comment when blocked" do + note = create(:note_with_comments) + user = create(:user) + sign_in_as(user) + visit note_path(note) + block = create(:user_block, :user => user) + + within_sidebar do + fill_in "text", :with => "Comment that won't be added while blocked" + + assert_no_text "Comment from #{user.display_name}" + assert_no_text "Comment that won't be added while blocked" + assert_no_text "Your access to the API has been blocked" + assert_button "Comment & Resolve", :disabled => false + assert_button "Comment", :disabled => false + + click_on "Comment" + + assert_no_text "Comment from #{user.display_name}" + assert_no_text "Comment that won't be added while blocked" + assert_text "Your access to the API has been blocked" + assert_button "Comment & Resolve", :disabled => false + assert_button "Comment", :disabled => false + + block.revoke! block.creator + + click_on "Comment" + + assert_text "Comment from #{user.display_name}" + assert_text "Comment that won't be added while blocked" + assert_no_text "Your access to the API has been blocked" + 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