Merge branch 'da-feature-flags' into 'master'
Allow feature flag names to be a symbol See merge request gitlab-org/gitlab-ce!20728
This commit is contained in:
commit
cc540bb2a2
|
@ -39,7 +39,7 @@ class Feature
|
|||
# Flipper creates on-memory features when asked for a not-yet-created one.
|
||||
# If we want to check if a feature has been actually set, we look for it
|
||||
# on the persisted features list.
|
||||
persisted_names.include?(feature.name)
|
||||
persisted_names.include?(feature.name.to_s)
|
||||
end
|
||||
|
||||
def enabled?(key, thing = nil)
|
||||
|
|
|
@ -39,7 +39,8 @@ describe Feature do
|
|||
end
|
||||
|
||||
describe '.persisted?' do
|
||||
it 'returns true for a persisted feature' do
|
||||
context 'when the feature is persisted' do
|
||||
it 'returns true when feature name is a string' do
|
||||
Feature::FlipperFeature.create!(key: 'foo')
|
||||
|
||||
feature = double(:feature, name: 'foo')
|
||||
|
@ -47,11 +48,28 @@ describe Feature do
|
|||
expect(described_class.persisted?(feature)).to eq(true)
|
||||
end
|
||||
|
||||
it 'returns false for a feature that is not persisted' do
|
||||
it 'returns true when feature name is a symbol' do
|
||||
Feature::FlipperFeature.create!(key: 'foo')
|
||||
|
||||
feature = double(:feature, name: :foo)
|
||||
|
||||
expect(described_class.persisted?(feature)).to eq(true)
|
||||
end
|
||||
end
|
||||
|
||||
context 'when the feature is not persisted' do
|
||||
it 'returns false when feature name is a string' do
|
||||
feature = double(:feature, name: 'foo')
|
||||
|
||||
expect(described_class.persisted?(feature)).to eq(false)
|
||||
end
|
||||
|
||||
it 'returns false when feature name is a symbol' do
|
||||
feature = double(:feature, name: :bar)
|
||||
|
||||
expect(described_class.persisted?(feature)).to eq(false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe '.all' do
|
||||
|
|
Loading…
Reference in New Issue