Skip to content

A platform for community discussion. Free, open, simple.

DEV: Update and reenable post voting specs (#39422)

Jarek Radosz992704f9f58d
diff --git a/plugins/discourse-post-voting/app/models/reviewable_post_voting_comment.rb b/plugins/discourse-post-voting/app/models/reviewable_post_voting_comment.rb
index 1d85f1ab520..67e5728024d 100644
--- a/plugins/discourse-post-voting/app/models/reviewable_post_voting_comment.rb
+++ b/plugins/discourse-post-voting/app/models/reviewable_post_voting_comment.rb
@@ -84,14 +84,6 @@ class ReviewablePostVotingComment < Reviewable
end
end
- def perform_no_action_comment(performed_by, args)
- if comment.deleted_at?
- create_result(:success, :approved, [created_by_id], true)
- else
- create_result(:success, :rejected, [created_by_id], true)
- end
- end
-
def perform_agree_and_keep_comment(performed_by, args)
agree
end
diff --git a/plugins/discourse-post-voting/config/locales/server.en.yml b/plugins/discourse-post-voting/config/locales/server.en.yml
index b99bce66443..617a5d24be5 100644
--- a/plugins/discourse-post-voting/config/locales/server.en.yml
+++ b/plugins/discourse-post-voting/config/locales/server.en.yml
@@ -31,11 +31,6 @@ en:
discourse_post_voting:
reviewables:
actions:
- comment_actions:
- bundle_title: "What do you want to do with the comment?"
- no_action_comment:
- title: "No action"
- description: "Leave the comment as is."
agree_and_keep_comment:
title: "Keep comment"
description: "Agree with flag and keep the comment unchanged."
diff --git a/plugins/discourse-post-voting/spec/system/viewing_reviewable_spec.rb b/plugins/discourse-post-voting/spec/system/viewing_reviewable_spec.rb
index fb00ea42159..1da29a50f7e 100644
--- a/plugins/discourse-post-voting/spec/system/viewing_reviewable_spec.rb
+++ b/plugins/discourse-post-voting/spec/system/viewing_reviewable_spec.rb
@@ -14,43 +14,64 @@ describe "Viewing reviewable post voting comment" do
sign_in(admin)
end
- it "has created at history item" do
+ it "has the created_at history item" do
review_page.visit_reviewable(reviewable)
expect(review_page).to have_history_items(count: 2)
expect(review_page).to have_created_at_history_item
end
- xit "Allows to delete and restore comment" do
+ it "allows to agree with the flag and delete the comment" do
review_page.visit_reviewable(reviewable)
-
expect(page).to have_text(comment.raw)
- review_page.select_bundled_action(reviewable, "post_voting_comment-agree_and_delete")
+ review_page.select_bundled_action(
+ reviewable,
+ "post_voting_comment-agree_and_delete",
+ bundle_index: 1,
+ )
expect(review_page).to have_reviewable_with_approved_status(reviewable)
review_page.visit_reviewable(reviewable)
expect(page).not_to have_text(comment.raw)
-
- review_page.select_bundled_action(reviewable, "post_voting_comment-agree_and_restore")
- expect(review_page).to have_reviewable_with_approved_status(reviewable)
- expect(page).to have_text(comment.raw)
-
- review_page.select_bundled_action(reviewable, "post_voting_comment-agree_and_delete")
- review_page.select_bundled_action(reviewable, "post_voting_comment-disagree_and_restore")
- expect(review_page).to have_reviewable_with_rejected_status(reviewable)
end
- xit "Allows to ignore the reviewable" do
+ it "allows to agree with the flag and keep the comment" do
review_page.visit_reviewable(reviewable)
- review_page.select_bundled_action(reviewable, "post_voting_comment-no_action_comment")
- expect(review_page).to have_reviewable_with_rejected_status(reviewable)
+ review_page.select_bundled_action(
+ reviewable,
+ "post_voting_comment-agree_and_keep_comment",
+ bundle_index: 1,
+ )
+ expect(review_page).to have_reviewable_with_approved_status(reviewable)
end
- xit "Allows to keep comment" do
- review_page.visit_reviewable(reviewable)
+ context "when the comment is already deleted" do
+ before { comment.trash!(admin) }
- review_page.select_bundled_action(reviewable, "post_voting_comment-agree_and_keep_comment")
- expect(review_page).to have_reviewable_with_approved_status(reviewable)
+ it "allows to agree with the flag and restore the comment" do
+ review_page.visit_reviewable(reviewable)
+ expect(page).not_to have_text(comment.raw)
+
+ review_page.select_bundled_action(
+ reviewable,
+ "post_voting_comment-agree_and_restore",
+ bundle_index: 1,
+ )
+ expect(review_page).to have_reviewable_with_approved_status(reviewable)
+ expect(page).to have_text(comment.raw)
+ end
+
+ it "allows to disagree with the flag and restore the comment" do
+ review_page.visit_reviewable(reviewable)
+
+ review_page.select_bundled_action(
+ reviewable,
+ "post_voting_comment-disagree_and_restore",
+ bundle_index: 2,
+ )
+ expect(review_page).to have_reviewable_with_rejected_status(reviewable)
+ expect(page).to have_text(comment.raw)
+ end
end
end
diff --git a/spec/system/page_objects/pages/review.rb b/spec/system/page_objects/pages/review.rb
index 84070257535..51e6f7e96d2 100644
--- a/spec/system/page_objects/pages/review.rb
+++ b/spec/system/page_objects/pages/review.rb
@@ -14,16 +14,15 @@ module PageObjects
def select_bundled_action(reviewable, value, bundle_index: nil)
within(reviewable_by_id(reviewable.id)) do
- if bundle_index
- dropdown =
+ dropdown =
+ if bundle_index
PageObjects::Components::SelectKit.new(
"#{REVIEWABLE_ACTION_DROPDOWN}:nth-of-type(#{bundle_index})",
)
- dropdown.expand
- dropdown.select_row_by_name(value)
- else
- reviewable_action_dropdown.select_row_by_value(value)
- end
+ else
+ reviewable_action_dropdown
+ end
+ dropdown.select_row_by_value(value)
end
end