Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32

1 files changed, 10 insertions, 8 deletions

diff --git a/spec/models/operations/feature_flag_spec.rb b/spec/models/operations/feature_flag_spec.rb
index db432e73355..b4e941f2856 100644
--- a/spec/models/operations/feature_flag_spec.rb
+++ b/spec/models/operations/feature_flag_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Operations::FeatureFlag do
     context 'a version 1 feature flag' do
       it 'is valid if associated with Operations::FeatureFlagScope models' do
         project = create(:project)
-        feature_flag = described_class.create({ name: 'test', project: project, version: 1,
+        feature_flag = described_class.create!({ name: 'test', project: project, version: 1,
                                  scopes_attributes: [{ environment_scope: '*', active: false }] })
 
         expect(feature_flag).to be_valid
@@ -33,9 +33,10 @@ RSpec.describe Operations::FeatureFlag do
 
       it 'is invalid if associated with Operations::FeatureFlags::Strategy models' do
         project = create(:project)
-        feature_flag = described_class.create({ name: 'test', project: project, version: 1,
+        feature_flag = described_class.new({ name: 'test', project: project, version: 1,
                                  strategies_attributes: [{ name: 'default', parameters: {} }] })
 
+        expect(feature_flag.valid?).to eq(false)
         expect(feature_flag.errors.messages).to eq({
           version_associations: ["version 1 feature flags may not have strategies"]
         })
@@ -45,9 +46,10 @@ RSpec.describe Operations::FeatureFlag do
     context 'a version 2 feature flag' do
       it 'is invalid if associated with Operations::FeatureFlagScope models' do
         project = create(:project)
-        feature_flag = described_class.create({ name: 'test', project: project, version: 2,
+        feature_flag = described_class.new({ name: 'test', project: project, version: 2,
                                  scopes_attributes: [{ environment_scope: '*', active: false }] })
 
+        expect(feature_flag.valid?).to eq(false)
         expect(feature_flag.errors.messages).to eq({
           version_associations: ["version 2 feature flags may not have scopes"]
         })
@@ -55,7 +57,7 @@ RSpec.describe Operations::FeatureFlag do
 
       it 'is valid if associated with Operations::FeatureFlags::Strategy models' do
         project = create(:project)
-        feature_flag = described_class.create({ name: 'test', project: project, version: 2,
+        feature_flag = described_class.create!({ name: 'test', project: project, version: 2,
                                                 strategies_attributes: [{ name: 'default', parameters: {} }] })
 
         expect(feature_flag).to be_valid
@@ -75,7 +77,7 @@ RSpec.describe Operations::FeatureFlag do
     it 'defaults to 1 if unspecified' do
       project = create(:project)
 
-      feature_flag = described_class.create(name: 'my_flag', project: project, active: true)
+      feature_flag = described_class.create!(name: 'my_flag', project: project, active: true)
 
       expect(feature_flag).to be_valid
       expect(feature_flag.version_before_type_cast).to eq(1)
@@ -113,14 +115,14 @@ RSpec.describe Operations::FeatureFlag do
 
     context 'with a version 1 feature flag' do
       it 'creates a default scope' do
-        feature_flag = described_class.create({ name: 'test', project: project, scopes_attributes: [], version: 1 })
+        feature_flag = described_class.create!({ name: 'test', project: project, scopes_attributes: [], version: 1 })
 
         expect(feature_flag.scopes.count).to eq(1)
         expect(feature_flag.scopes.first.environment_scope).to eq('*')
       end
 
       it 'allows specifying the default scope in the parameters' do
-        feature_flag = described_class.create({ name: 'test', project: project,
+        feature_flag = described_class.create!({ name: 'test', project: project,
                                                 scopes_attributes: [{ environment_scope: '*', active: false },
                                                                     { environment_scope: 'review/*', active: true }], version: 1 })
 
@@ -131,7 +133,7 @@ RSpec.describe Operations::FeatureFlag do
 
     context 'with a version 2 feature flag' do
       it 'does not create a default scope' do
-        feature_flag = described_class.create({ name: 'test', project: project, scopes_attributes: [], version: 2 })
+        feature_flag = described_class.create!({ name: 'test', project: project, scopes_attributes: [], version: 2 })
 
         expect(feature_flag.scopes).to eq([])
       end