-
Notifications
You must be signed in to change notification settings - Fork 16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Expose multi-CV feature downstream #85
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,13 @@ | ||
# 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?(key) | ||
end | ||
|
||
def include?(key) | ||
SETTINGS.include?(key.to_s) | ||
end | ||
end |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
require 'test_plugin_helper' | ||
|
||
class SettingRegistryBrandingTest < ActiveSupport::TestCase | ||
# rubocop:disable Metrics/BlockLength | ||
describe 'stubbed creation' do | ||
test 'it replaces value to a branded one using DSL' do | ||
Setting.where(name: 'dsl_setting').delete_all | ||
|
@@ -27,14 +28,29 @@ class SettingRegistryBrandingTest < ActiveSupport::TestCase | |
end | ||
|
||
test 'hides upstream-only settings' do | ||
assert_nil Setting['allow_multiple_content_views'] | ||
Foreman::SettingManager.define('test2') do | ||
category(:Content) do | ||
setting( | ||
:test_setting, | ||
description: N_("Upstream-only setting test"), | ||
default: 'definitely not falsey', | ||
full_name: N_('Upstream-only setting test'), | ||
type: :string | ||
) | ||
end | ||
end | ||
Foreman.settings.load | ||
UpstreamOnlySettings.expects(:include?).with('test_setting').returns(true) | ||
assert_nil Setting['test_setting'] | ||
end | ||
end | ||
# rubocop:enable Metrics/BlockLength | ||
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'] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You are not defining the Also not related to this specific PR: why do we have two classes in a single file? Can we separate them please? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this relies on the fact that |
||
end | ||
end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You never add
test_setting
toUpstreamOnlySettings::SETTINGS
, so this test is not testing what it says to be testing.Wouldn't you need to first declare that setting with a default value, then add it to UpstreamOnlySettings and then assert the result is
nil
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't
due to
But I did add the setting definition in the test.
(and did confirm it does fail when I comment out the
)
does that look okay?