Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/factories/operations/feature_flags/strategy.rb b/spec/factories/operations/feature_flags/strategy.rb
index bdb5d9f0f3c..8d04b6d25aa 100644
--- a/spec/factories/operations/feature_flags/strategy.rb
+++ b/spec/factories/operations/feature_flags/strategy.rb
@@ -5,5 +5,37 @@ FactoryBot.define do
     association :feature_flag, factory: :operations_feature_flag
     name { "default" }
     parameters { {} }
+
+    trait :default do
+      name { "default" }
+      parameters { {} }
+    end
+
+    trait :gitlab_userlist do
+      association :user_list, factory: :operations_feature_flag_user_list
+      name { "gitlabUserList" }
+      parameters { {} }
+    end
+
+    trait :flexible_rollout do
+      name { "flexibleRollout" }
+      parameters do
+        {
+          groupId: 'default',
+          rollout: '10',
+          stickiness: 'default'
+        }
+      end
+    end
+
+    trait :gradual_rollout do
+      name { "gradualRolloutUserId" }
+      parameters { { percentage: '10', groupId: 'default' } }
+    end
+
+    trait :userwithid do
+      name { "userWithId" }
+      parameters { { userIds: 'user1' } }
+    end
   end
 end