A platform for community discussion. Free, open, simple.
FIX: Upcoming change problem check not respecting should_display? (#41955)
Martin Brennanf36388234b79
diff --git a/app/services/problem_check/upcoming_change_stable_opted_out.rb b/app/services/problem_check/upcoming_change_stable_opted_out.rbindex 7212a9d7117..5219b17b098 100644--- a/app/services/problem_check/upcoming_change_stable_opted_out.rb+++ b/app/services/problem_check/upcoming_change_stable_opted_out.rb@@ -5,9 +5,11 @@ class ProblemCheck::UpcomingChangeStableOptedOut < ProblemCheckself.targets = -> { SiteSetting.upcoming_change_site_settings }def call+ return no_problem if !UpcomingChanges::ConditionalDisplay.should_display?(target)+# If the site setting is enabled, then the change is opted in, either# manually or automatically, so we skip it.- return no_problem if SiteSetting.send(target)+ return no_problem if UpcomingChanges.enabled?(target)# Don't care about any changes that are not yet stable, admins can opt# in and out of these without worry.diff --git a/spec/services/problem_check/upcoming_change_stable_opted_out_spec.rb b/spec/services/problem_check/upcoming_change_stable_opted_out_spec.rbindex f2dce91b5e7..096dc874a1c 100644--- a/spec/services/problem_check/upcoming_change_stable_opted_out_spec.rb+++ b/spec/services/problem_check/upcoming_change_stable_opted_out_spec.rb@@ -49,5 +49,27 @@ RSpec.describe ProblemCheck::UpcomingChangeStableOptedOut doit { expect(check).to be_chill_about_it }end++ context "when upcoming change is not enabled and should not be displayed for the site" do+ before do+ mock_upcoming_change_metadata(+ {+ enable_upload_debug_mode: {+ impact: "other,developers",+ status: :stable,+ impact_type: "feature",+ impact_role: "admins",+ },+ },+ )+ UpcomingChanges::ConditionalDisplay+ .expects(:should_display_enable_upload_debug_mode?)+ .at_least_once+ .returns(false)+ SiteSetting.enable_upload_debug_mode = false+ end++ it { expect(check).to be_chill_about_it }+ endendenddiff --git a/spec/support/matchers/problem_check_matcher.rb b/spec/support/matchers/problem_check_matcher.rbindex bc241d3f304..ee53efdbea6 100644--- a/spec/support/matchers/problem_check_matcher.rb+++ b/spec/support/matchers/problem_check_matcher.rb@@ -2,6 +2,10 @@RSpec::Matchers.define :be_chill_about_it domatch { |service| expect(service.call).to be_blank }++ failure_message do |service|+ "Expected check to be chill about it, but it had a problem: #{service.call.inspect}"+ endendRSpec::Matchers.define :have_a_problem do