Skip to content

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

DEV: bump remove and replace uncategorized (#42772)

David Battersbyc1c577f13064
diff --git a/config/site_settings.yml b/config/site_settings.yml
index b05eca1aa7b..cf8bbe6b456 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -1432,7 +1432,7 @@ posting:
client: true
hidden: true
upcoming_change:
- status: "alpha"
+ status: "beta"
impact: "other,all_members"
allow_enabled_for:
- everyone
diff --git a/spec/lib/upcoming_changes_spec.rb b/spec/lib/upcoming_changes_spec.rb
index 46ca20c7594..5f704533cd0 100644
--- a/spec/lib/upcoming_changes_spec.rb
+++ b/spec/lib/upcoming_changes_spec.rb
@@ -800,6 +800,8 @@ RSpec.describe UpcomingChanges do
let(:hidden_setting_names) { %i[allow_uncategorized_topics suppress_uncategorized_badge] }
before do
+ SiteSetting.remove_and_replace_uncategorized = false
+
mock_upcoming_change_metadata(
{
enable_upload_debug_mode: {
diff --git a/spec/services/site_setting/action/remove_and_replace_uncategorized_toggled_spec.rb b/spec/services/site_setting/action/remove_and_replace_uncategorized_toggled_spec.rb
index 063b46134ec..be103f400c7 100644
--- a/spec/services/site_setting/action/remove_and_replace_uncategorized_toggled_spec.rb
+++ b/spec/services/site_setting/action/remove_and_replace_uncategorized_toggled_spec.rb
@@ -185,6 +185,7 @@ RSpec.describe SiteSetting::Action::RemoveAndReplaceUncategorizedToggled do
it "is hidden once uncategorized topics are disallowed and the change is off" do
SiteSetting.allow_uncategorized_topics = false
+ SiteSetting.remove_and_replace_uncategorized = false
expect(described_class.should_display_upcoming_change?).to eq(false)
end
@@ -201,6 +202,8 @@ RSpec.describe SiteSetting::Action::RemoveAndReplaceUncategorizedToggled do
let(:legacy_settings) { %i[allow_uncategorized_topics suppress_uncategorized_badge] }
it "hides the legacy uncategorized settings only while the change is enabled" do
+ SiteSetting.remove_and_replace_uncategorized = false
+
expect(SiteSetting.hidden_settings).not_to include(*legacy_settings)
SiteSetting.remove_and_replace_uncategorized = true