diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 15:10:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 15:10:11 +0300 |
commit | 96acc69fae1ee7d559ba7eaa4e8304c8261525e3 (patch) | |
tree | b1ed433da35a415cab8ed544d85ac4c939efab0e /spec/factories/operations | |
parent | a1498861799d1695682d72870580a6c3fb5ca3cf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories/operations')
-rw-r--r-- | spec/factories/operations/feature_flag_scopes.rb | 2 | ||||
-rw-r--r-- | spec/factories/operations/feature_flags.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/factories/operations/feature_flag_scopes.rb b/spec/factories/operations/feature_flag_scopes.rb index a98c397b8b5..4ca9b53f320 100644 --- a/spec/factories/operations/feature_flag_scopes.rb +++ b/spec/factories/operations/feature_flag_scopes.rb @@ -2,7 +2,7 @@ FactoryBot.define do factory :operations_feature_flag_scope, class: 'Operations::FeatureFlagScope' do - association :feature_flag, factory: :operations_feature_flag + association :feature_flag, factory: [:operations_feature_flag, :legacy_flag] active { true } strategies { [{ name: "default", parameters: {} }] } sequence(:environment_scope) { |n| "review/patch-#{n}" } diff --git a/spec/factories/operations/feature_flags.rb b/spec/factories/operations/feature_flags.rb index 7e43d38a04f..32e5ec9fb26 100644 --- a/spec/factories/operations/feature_flags.rb +++ b/spec/factories/operations/feature_flags.rb @@ -5,6 +5,7 @@ FactoryBot.define do sequence(:name) { |n| "feature_flag_#{n}" } project active { true } + version { :new_version_flag } trait :legacy_flag do version { Operations::FeatureFlag.versions['legacy_flag'] } |