Skip to content

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

Revert "DEV: Promote dashboard_improvements upcoming change to beta" (#42088)

Krzysztof Kotlarek6d6de3397123
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 0440fcf6f77..6bced848ec1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4807,7 +4807,7 @@ experimental:
hidden: true
client: true
upcoming_change:
- status: "beta"
+ status: "alpha"
impact: "feature,admins"
learn_more_url: "https://meta.discourse.org/t/-/404528"
admin_dashboard_reports_seeded:
diff --git a/plugins/discourse-ai/spec/system/admin_dashboard_spec.rb b/plugins/discourse-ai/spec/system/admin_dashboard_spec.rb
index 6462de7de8c..0c1aca314d2 100644
--- a/plugins/discourse-ai/spec/system/admin_dashboard_spec.rb
+++ b/plugins/discourse-ai/spec/system/admin_dashboard_spec.rb
@@ -3,10 +3,7 @@
RSpec.describe "Admin dashboard" do
fab!(:admin)
- before do
- enable_current_plugin
- SiteSetting.dashboard_improvements = false
- end
+ before { enable_current_plugin }
it "displays the sentiment dashboard" do
SiteSetting.ai_sentiment_enabled = true
diff --git a/spec/requests/admin/dashboard_controller_spec.rb b/spec/requests/admin/dashboard_controller_spec.rb
index 16c3dab36fc..1ed4843d898 100644
--- a/spec/requests/admin/dashboard_controller_spec.rb
+++ b/spec/requests/admin/dashboard_controller_spec.rb
@@ -41,8 +41,6 @@ RSpec.describe Admin::DashboardController do
describe "#index" do
shared_examples "version info present" do
- before { SiteSetting.dashboard_improvements = false }
-
it "returns discourse version info" do
get "/admin/dashboard.json"
@@ -52,10 +50,7 @@ RSpec.describe Admin::DashboardController do
end
shared_examples "version info absent" do
- before do
- SiteSetting.dashboard_improvements = false
- SiteSetting.version_checks = false
- end
+ before { SiteSetting.version_checks = false }
it "does not return discourse version info" do
get "/admin/dashboard.json"
@@ -261,7 +256,6 @@ RSpec.describe Admin::DashboardController do
end
it "does not expose admin-only browser pageview cards to moderators" do
- SiteSetting.use_legacy_pageviews = false
SiteSetting.persist_browser_pageview_events = true
configure_dashboard_sections(%w[traffic])
diff --git a/spec/system/admin_dashboard_community_health_spec.rb b/spec/system/admin_dashboard_community_health_spec.rb
index 755746c1a86..8b1fc131eb9 100644
--- a/spec/system/admin_dashboard_community_health_spec.rb
+++ b/spec/system/admin_dashboard_community_health_spec.rb
@@ -3,10 +3,7 @@
describe "Admin Dashboard Community Health" do
fab!(:current_user, :admin)
- before do
- SiteSetting.dashboard_improvements = false
- sign_in(current_user)
- end
+ before { sign_in(current_user) }
describe "Pageview Report" do
context "when use_legacy_pageviews is true" do
diff --git a/spec/system/admin_dashboard_general_spec.rb b/spec/system/admin_dashboard_general_spec.rb
index 2bc6344385d..574c0a3d144 100644
--- a/spec/system/admin_dashboard_general_spec.rb
+++ b/spec/system/admin_dashboard_general_spec.rb
@@ -7,10 +7,7 @@ describe "Admin Dashboard General Tab" do
fab!(:user_visit_2) { Fabricate(:user_visit, user: user, mobile: true) }
fab!(:user_visit_3) { Fabricate(:user_visit, user: user, visited_at: 1.day.ago) }
- before do
- SiteSetting.dashboard_improvements = false
- sign_in(admin)
- end
+ before { sign_in(admin) }
it "displays correct visit counters combining desktop and mobile visits" do
visit("/admin")
diff --git a/spec/system/admin_notices_spec.rb b/spec/system/admin_notices_spec.rb
index 047f72baa86..811a8e48210 100644
--- a/spec/system/admin_notices_spec.rb
+++ b/spec/system/admin_notices_spec.rb
@@ -4,7 +4,6 @@ describe "Admin Notices" do
let(:admin_dashboard) { PageObjects::Pages::AdminDashboard.new }
before do
- SiteSetting.dashboard_improvements = false
Fabricate(:admin_notice)
I18n.backend.store_translations(:en, dashboard: { problem: { test_notice: "Houston" } })