diff --git a/spec/system/comments/budget_investments_spec.rb b/spec/system/comments/budget_investments_spec.rb index c166fba2e..6712a7425 100644 --- a/spec/system/comments/budget_investments_spec.rb +++ b/spec/system/comments/budget_investments_spec.rb @@ -6,28 +6,6 @@ describe "Commenting Budget::Investments" do it_behaves_like "flaggable", :budget_investment_comment - scenario "Reply" do - citizen = create(:user, username: "Ana") - manuela = create(:user, username: "Manuela") - comment = create(:comment, commentable: investment, user: citizen) - - login_as(manuela) - visit budget_investment_path(investment.budget, investment) - - click_link "Reply" - - within "#js-comment-form-comment_#{comment.id}" do - fill_in "Leave your comment", with: "It will be done next week." - click_button "Publish reply" - end - - within "#comment_#{comment.id}" do - expect(page).to have_content "It will be done next week." - end - - expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" - end - scenario "Reply update parent comment responses count" do comment = create(:comment, commentable: investment) diff --git a/spec/system/comments/debates_spec.rb b/spec/system/comments/debates_spec.rb index 10f586992..b1ac6a21a 100644 --- a/spec/system/comments/debates_spec.rb +++ b/spec/system/comments/debates_spec.rb @@ -77,28 +77,6 @@ describe "Commenting debates" do end end - scenario "Reply" do - citizen = create(:user, username: "Ana") - manuela = create(:user, username: "Manuela") - comment = create(:comment, commentable: debate, user: citizen) - - login_as(manuela) - visit debate_path(debate) - - click_link "Reply" - - within "#js-comment-form-comment_#{comment.id}" do - fill_in "Leave your comment", with: "It will be done next week." - click_button "Publish reply" - end - - within "#comment_#{comment.id}" do - expect(page).to have_content "It will be done next week." - end - - expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" - end - scenario "Reply to reply" do create(:comment, commentable: debate, body: "Any estimates?") diff --git a/spec/system/comments/legislation_annotations_spec.rb b/spec/system/comments/legislation_annotations_spec.rb index 301d8feeb..0c62fee2f 100644 --- a/spec/system/comments/legislation_annotations_spec.rb +++ b/spec/system/comments/legislation_annotations_spec.rb @@ -6,29 +6,6 @@ describe "Commenting legislation questions" do it_behaves_like "flaggable", :legislation_annotation_comment - scenario "Reply" do - citizen = create(:user, username: "Ana") - manuela = create(:user, username: "Manuela") - annotation = create(:legislation_annotation, author: citizen) - comment = annotation.comments.first - - login_as(manuela) - visit polymorphic_path(annotation) - - click_link "Reply" - - within "#js-comment-form-comment_#{comment.id}" do - fill_in "Leave your comment", with: "It will be done next week." - click_button "Publish reply" - end - - within "#comment_#{comment.id}" do - expect(page).to have_content "It will be done next week." - end - - expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" - end - scenario "Reply update parent comment responses count" do manuela = create(:user, :level_two, username: "Manuela") annotation = create(:legislation_annotation) diff --git a/spec/system/comments/legislation_questions_spec.rb b/spec/system/comments/legislation_questions_spec.rb index c30706eae..925f7c07d 100644 --- a/spec/system/comments/legislation_questions_spec.rb +++ b/spec/system/comments/legislation_questions_spec.rb @@ -10,28 +10,6 @@ describe "Commenting legislation questions" do it_behaves_like "flaggable", :legislation_question_comment end - scenario "Reply" do - citizen = create(:user, username: "Ana") - manuela = create(:user, :level_two, username: "Manuela") - comment = create(:comment, commentable: question, user: citizen) - - login_as(manuela) - visit legislation_process_question_path(question.process, question) - - click_link "Reply" - - within "#js-comment-form-comment_#{comment.id}" do - fill_in "Leave your answer", with: "It will be done next week." - click_button "Publish reply" - end - - within "#comment_#{comment.id}" do - expect(page).to have_content "It will be done next week." - end - - expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" - end - scenario "Reply update parent comment responses count" do manuela = create(:user, :level_two, username: "Manuela") comment = create(:comment, commentable: question) diff --git a/spec/system/comments/polls_spec.rb b/spec/system/comments/polls_spec.rb index 7e8c1e7aa..4f48a1a61 100644 --- a/spec/system/comments/polls_spec.rb +++ b/spec/system/comments/polls_spec.rb @@ -4,28 +4,6 @@ describe "Commenting polls" do let(:user) { create(:user) } let(:poll) { create(:poll, author: create(:user)) } - scenario "Reply" do - citizen = create(:user, username: "Ana") - manuela = create(:user, username: "Manuela") - comment = create(:comment, commentable: poll, user: citizen) - - login_as(manuela) - visit poll_path(poll) - - click_link "Reply" - - within "#js-comment-form-comment_#{comment.id}" do - fill_in "Leave your comment", with: "It will be done next week." - click_button "Publish reply" - end - - within "#comment_#{comment.id}" do - expect(page).to have_content "It will be done next week." - end - - expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" - end - scenario "Reply update parent comment responses count" do comment = create(:comment, commentable: poll) diff --git a/spec/system/comments/proposals_spec.rb b/spec/system/comments/proposals_spec.rb index 47038f17b..a16b36763 100644 --- a/spec/system/comments/proposals_spec.rb +++ b/spec/system/comments/proposals_spec.rb @@ -6,28 +6,6 @@ describe "Commenting proposals" do it_behaves_like "flaggable", :proposal_comment - scenario "Reply" do - citizen = create(:user, username: "Ana") - manuela = create(:user, username: "Manuela") - comment = create(:comment, commentable: proposal, user: citizen) - - login_as(manuela) - visit proposal_path(proposal) - - click_link "Reply" - - within "#js-comment-form-comment_#{comment.id}" do - fill_in "Leave your comment", with: "It will be done next week." - click_button "Publish reply" - end - - within "#comment_#{comment.id}" do - expect(page).to have_content "It will be done next week." - end - - expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" - end - scenario "Reply update parent comment responses count" do comment = create(:comment, commentable: proposal) diff --git a/spec/system/comments/topics_spec.rb b/spec/system/comments/topics_spec.rb index 2e9900cdd..9075cfbf9 100644 --- a/spec/system/comments/topics_spec.rb +++ b/spec/system/comments/topics_spec.rb @@ -6,30 +6,6 @@ describe "Commenting topics from proposals" do it_behaves_like "flaggable", :topic_with_community_comment - scenario "Reply" do - community = proposal.community - topic = create(:topic, community: community) - citizen = create(:user, username: "Ana") - manuela = create(:user, username: "Manuela") - comment = create(:comment, commentable: topic, user: citizen) - - login_as(manuela) - visit community_topic_path(community, topic) - - click_link "Reply" - - within "#js-comment-form-comment_#{comment.id}" do - fill_in "Leave your comment", with: "It will be done next week." - click_button "Publish reply" - end - - within "#comment_#{comment.id}" do - expect(page).to have_content "It will be done next week." - end - - expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" - end - scenario "Reply update parent comment responses count" do community = proposal.community topic = create(:topic, community: community) @@ -334,30 +310,6 @@ describe "Commenting topics from budget investments" do let(:user) { create(:user) } let(:investment) { create(:budget_investment) } - scenario "Reply" do - community = investment.community - topic = create(:topic, community: community) - citizen = create(:user, username: "Ana") - manuela = create(:user, username: "Manuela") - comment = create(:comment, commentable: topic, user: citizen) - - login_as(manuela) - visit community_topic_path(community, topic) - - click_link "Reply" - - within "#js-comment-form-comment_#{comment.id}" do - fill_in "Leave your comment", with: "It will be done next week." - click_button "Publish reply" - end - - within "#comment_#{comment.id}" do - expect(page).to have_content "It will be done next week." - end - - expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" - end - scenario "Errors on reply" do community = investment.community topic = create(:topic, community: community) diff --git a/spec/system/comments_spec.rb b/spec/system/comments_spec.rb index 27313cb75..b9172992e 100644 --- a/spec/system/comments_spec.rb +++ b/spec/system/comments_spec.rb @@ -306,6 +306,28 @@ describe "Comments" do end end + scenario "Reply" do + comment = create(:comment, commentable: resource) + + login_as(user) + visit polymorphic_path(resource) + + within "#comment_#{comment.id}" do + click_link "Reply" + end + + within "#js-comment-form-comment_#{comment.id}" do + fill_in fill_text, with: "It will be done next week." + click_button "Publish reply" + end + + within "#comment_#{comment.id}" do + expect(page).to have_content "It will be done next week." + end + + expect(page).not_to have_css "#js-comment-form-comment_#{comment.id}" + end + scenario "Errors on create" do login_as(user) visit polymorphic_path(resource)