File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -90,7 +90,7 @@ def self.override_default_flags(feature_flag_overrides)
90
90
invalid_keys = feature_flag_overrides . keys . to_set - FeatureFlag ::DEFAULT_FLAGS . keys . to_set
91
91
raise "Invalid feature flag name(s): #{ invalid_keys . to_a } " if invalid_keys . any?
92
92
93
- invalid_values = feature_flag_overrides . select { |k , v | ! v . in? [ true , false ] }
93
+ invalid_values = feature_flag_overrides . reject { |_ , v | v . is_a? ( TrueClass ) || v . is_a? ( FalseClass ) }
94
94
raise "Invalid feature flag value(s): #{ invalid_values } " if invalid_values . any?
95
95
96
96
feature_flag_overrides . each do |flag_name , flag_value |
Original file line number Diff line number Diff line change @@ -294,28 +294,28 @@ module VCAP::CloudController
294
294
feature_flag_overrides = { an_invalid_name : true }
295
295
expect do
296
296
FeatureFlag . override_default_flags ( feature_flag_overrides )
297
- end . to raise_error ( " Invalid feature flag name(s): [:an_invalid_name]" )
297
+ end . to raise_error ( ' Invalid feature flag name(s): [:an_invalid_name]' )
298
298
end
299
299
300
300
it 'raises an error for a mix of valid and invalid names' do
301
301
feature_flag_overrides = { diego_docker : true , an_invalid_name : true }
302
302
expect do
303
303
FeatureFlag . override_default_flags ( feature_flag_overrides )
304
- end . to raise_error ( " Invalid feature flag name(s): [:an_invalid_name]" )
304
+ end . to raise_error ( ' Invalid feature flag name(s): [:an_invalid_name]' )
305
305
end
306
306
307
307
it 'raises an error for all invalid names' do
308
308
feature_flag_overrides = { invalid_name1 : true , invalid_name2 : false }
309
309
expect do
310
310
FeatureFlag . override_default_flags ( feature_flag_overrides )
311
- end . to raise_error ( " Invalid feature flag name(s): [:invalid_name1, :invalid_name2]" )
311
+ end . to raise_error ( ' Invalid feature flag name(s): [:invalid_name1, :invalid_name2]' )
312
312
end
313
313
314
314
it 'raises an error for invalid values' do
315
315
feature_flag_overrides = { diego_docker : 'an invalid value' , user_org_creation : false }
316
316
expect do
317
317
FeatureFlag . override_default_flags ( feature_flag_overrides )
318
- end . to raise_error ( " Invalid feature flag value(s): {:diego_docker=>\ " an invalid value\" }" )
318
+ end . to raise_error ( ' Invalid feature flag value(s): {:diego_docker=>"an invalid value"}' )
319
319
end
320
320
end
321
321
You can’t perform that action at this time.
0 commit comments