From d02929254d976b94315889a40101f5e348ab6019 Mon Sep 17 00:00:00 2001 From: Jeremy Lenz Date: Fri, 27 Sep 2024 16:50:56 -0400 Subject: [PATCH] Expose multi-CV feature downstream --- app/models/concerns/upstream_only_settings.rb | 9 +++++++-- test/unit/setting_registry_branding_test.rb | 8 +++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/models/concerns/upstream_only_settings.rb b/app/models/concerns/upstream_only_settings.rb index ff14196..66aea16 100644 --- a/app/models/concerns/upstream_only_settings.rb +++ b/app/models/concerns/upstream_only_settings.rb @@ -1,6 +1,11 @@ # Settings to hide in downstream (will return nil for all values) -module UpstreamOnlySettings +class UpstreamOnlySettings SETTINGS = %w[ - allow_multiple_content_views ].freeze + + def self.include?(key) + new.include? + def include?(key) + SETTINGS.include?(key.to_s) + end end diff --git a/test/unit/setting_registry_branding_test.rb b/test/unit/setting_registry_branding_test.rb index c65b6ec..b33dfdf 100644 --- a/test/unit/setting_registry_branding_test.rb +++ b/test/unit/setting_registry_branding_test.rb @@ -27,14 +27,16 @@ class SettingRegistryBrandingTest < ActiveSupport::TestCase end test 'hides upstream-only settings' do - assert_nil Setting['allow_multiple_content_views'] + UpstreamOnlySettings.expects(:include?).with('test_setting').returns(true) + assert_nil Setting['test_setting'] end end end class SettingBrandingTest < ActiveSupport::TestCase test 'replaces warning for upstream-only settings' do - Rails.logger.expects(:debug).with('Setting \'allow_multiple_content_views\' is not available in Satellite; ignoring') - Setting['allow_multiple_content_views'] + UpstreamOnlySettings.expects(:include?).with('test_setting').returns(true) + Rails.logger.expects(:debug).with('Setting \'test_setting\' is not available in Satellite; ignoring') + Setting['test_setting'] end end \ No newline at end of file