Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

2 files changed, 6 insertions, 6 deletions

diff --git a/spec/models/operations/feature_flag_scope_spec.rb b/spec/models/operations/feature_flag_scope_spec.rb
index 29d338d8b29..dc83789fade 100644
--- a/spec/models/operations/feature_flag_scope_spec.rb
+++ b/spec/models/operations/feature_flag_scope_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Operations::FeatureFlagScope do
     end
 
     context 'when environment scope of a default scope is updated' do
-      let!(:feature_flag) { create(:operations_feature_flag) }
+      let!(:feature_flag) { create(:operations_feature_flag, :legacy_flag) }
       let!(:scope_default) { feature_flag.default_scope }
 
       it 'keeps default scope intact' do
@@ -41,7 +41,7 @@ RSpec.describe Operations::FeatureFlagScope do
     end
 
     context 'when a default scope is destroyed' do
-      let!(:feature_flag) { create(:operations_feature_flag) }
+      let!(:feature_flag) { create(:operations_feature_flag, :legacy_flag) }
       let!(:scope_default) { feature_flag.default_scope }
 
       it 'prevents from destroying the default scope' do
diff --git a/spec/models/operations/feature_flag_spec.rb b/spec/models/operations/feature_flag_spec.rb
index d5b3c7a8582..55682e12642 100644
--- a/spec/models/operations/feature_flag_spec.rb
+++ b/spec/models/operations/feature_flag_spec.rb
@@ -181,7 +181,7 @@ RSpec.describe Operations::FeatureFlag do
     end
 
     context 'when the feature flag is active and all scopes are inactive' do
-      let!(:feature_flag) { create(:operations_feature_flag, active: true) }
+      let!(:feature_flag) { create(:operations_feature_flag, :legacy_flag, active: true) }
 
       it 'returns the flag' do
         feature_flag.default_scope.update!(active: false)
@@ -199,7 +199,7 @@ RSpec.describe Operations::FeatureFlag do
     end
 
     context 'when the feature flag is inactive and all scopes are active' do
-      let!(:feature_flag) { create(:operations_feature_flag, active: false) }
+      let!(:feature_flag) { create(:operations_feature_flag, :legacy_flag, active: false) }
 
       it 'does not return the flag' do
         feature_flag.default_scope.update!(active: true)
@@ -221,7 +221,7 @@ RSpec.describe Operations::FeatureFlag do
     end
 
     context 'when the feature flag is active and all scopes are inactive' do
-      let!(:feature_flag) { create(:operations_feature_flag, active: true) }
+      let!(:feature_flag) { create(:operations_feature_flag, :legacy_flag, active: true) }
 
       it 'does not return the flag' do
         feature_flag.default_scope.update!(active: false)
@@ -239,7 +239,7 @@ RSpec.describe Operations::FeatureFlag do
     end
 
     context 'when the feature flag is inactive and all scopes are active' do
-      let!(:feature_flag) { create(:operations_feature_flag, active: false) }
+      let!(:feature_flag) { create(:operations_feature_flag, :legacy_flag, active: false) }
 
       it 'returns the flag' do
         feature_flag.default_scope.update!(active: true)