Skip to content

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

DEV: Update UC statuses for solved & topic voting plugins (#40184)

Martin Brennan2189309b5535
diff --git a/plugins/discourse-solved/config/settings.yml b/plugins/discourse-solved/config/settings.yml
index ce61ee64863..cd57cdcf550 100644
--- a/plugins/discourse-solved/config/settings.yml
+++ b/plugins/discourse-solved/config/settings.yml
@@ -63,7 +63,7 @@ discourse_solved:
hidden: true
client: true
upcoming_change:
- status: "stable"
+ status: "permanent"
impact: "feature,staff"
learn_more_url: "https://meta.discourse.org/t/-/398338"
enable_solved_shared_issues:
diff --git a/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb b/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb
index 752fc3513a3..f39233da479 100644
--- a/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb
+++ b/plugins/discourse-solved/spec/system/support_category_type_setup_spec.rb
@@ -54,26 +54,6 @@ RSpec.describe "Support Category Type Setup" do
expect(page).to have_css(".d-nav-submenu__tabs .edit-category-support")
end
- context "when the support category type setup is disabled" do
- before { SiteSetting.enable_support_category_type_setup = false }
-
- it "does not show the support category type" do
- visit("/new-category/setup")
- expect(page).not_to have_content(I18n.t("js.category.create_with_type", typeName: "support"))
- expect(page).to have_content(I18n.t("js.category.create_with_type", typeName: "discussion"))
- end
-
- it "does not show the tab for the support category type when editing an existing category" do
- support_category = Fabricate(:category, name: "Support")
- DiscourseSolved::Categories::Types::Support.configure_category(
- support_category,
- guardian: admin.guardian,
- )
- visit("/c/#{support_category.slug}/edit/support")
- expect(page).to have_no_css(".d-nav-submenu__tabs .edit-category-support")
- end
- end
-
context "for an existing category with no support category type" do
fab!(:category)
diff --git a/plugins/discourse-topic-voting/config/settings.yml b/plugins/discourse-topic-voting/config/settings.yml
index acfedaa3cd8..67e67a7bad7 100755
--- a/plugins/discourse-topic-voting/config/settings.yml
+++ b/plugins/discourse-topic-voting/config/settings.yml
@@ -52,6 +52,6 @@ discourse_topic_voting:
hidden: true
client: true
upcoming_change:
- status: "beta"
+ status: "stable"
impact: "feature,staff"
learn_more_url: "https://meta.discourse.org/t/-/399365"
diff --git a/plugins/discourse-topic-voting/spec/requests/categories_controller_spec.rb b/plugins/discourse-topic-voting/spec/requests/categories_controller_spec.rb
index 9daac6cebf6..37192869486 100644
--- a/plugins/discourse-topic-voting/spec/requests/categories_controller_spec.rb
+++ b/plugins/discourse-topic-voting/spec/requests/categories_controller_spec.rb
@@ -10,17 +10,6 @@ describe CategoriesController do
sign_in(admin)
end
- it "enables voting correctly" do
- put "/categories/#{category.id}.json",
- params: {
- custom_fields: {
- "enable_topic_voting" => true,
- },
- }
-
- expect(Category.can_vote?(category.id)).to eq(true)
- end
-
it "does not recreate database record" do
category_setting = DiscourseTopicVoting::CategorySetting.create!(category: category)
diff --git a/plugins/discourse-topic-voting/spec/system/voting_spec.rb b/plugins/discourse-topic-voting/spec/system/voting_spec.rb
index 8254f4cf5e3..a653c25961d 100644
--- a/plugins/discourse-topic-voting/spec/system/voting_spec.rb
+++ b/plugins/discourse-topic-voting/spec/system/voting_spec.rb
@@ -17,10 +17,12 @@ RSpec.describe "Topic voting" do
fab!(:post2) { Fabricate(:post, topic: topic2) }
let(:category_page) { PageObjects::Pages::Category.new }
+ let(:banner) { PageObjects::Components::AdminChangesBanner.new }
let(:topic_page) { PageObjects::Pages::Topic.new }
let(:user_page) { PageObjects::Pages::User.new }
let(:admin_page) { PageObjects::Pages::AdminSiteSettings.new }
let(:form) { PageObjects::Components::FormKit.new(".form-kit") }
+ let(:toast) { PageObjects::Components::Toasts.new }
before do
SiteSetting.topic_voting_enabled = true
@@ -31,12 +33,13 @@ RSpec.describe "Topic voting" do
category_page.visit(category1)
expect(category_page).to have_no_css(category_page.votes)
- # enable voting in category
- category_page.visit_settings(category1)
- form.field("custom_fields.enable_topic_voting").toggle
- category_page.save_settings
+ category_page.visit_general(category1)
+ category_type_selector = PageObjects::Components::DMenu.new(".category-type-selector")
+ category_type_selector.expand
+ category_type_selector.option(".category-type-selector__result.--category-type-ideas").click
+ banner.click_save
- expect(Category.can_vote?(category1.id)).to eq(true)
+ try_until_success { expect(Category.can_vote?(category1.id)).to eq(true) }
# make a vote
category_page.visit(category1)