Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/spec/factories/deploy_tokens.rb b/spec/factories/deploy_tokens.rb
index 42ed66ac191..e86d4ab8812 100644
--- a/spec/factories/deploy_tokens.rb
+++ b/spec/factories/deploy_tokens.rb
@@ -9,6 +9,7 @@ FactoryBot.define do
     read_registry { true }
     revoked { false }
     expires_at { 5.days.from_now }
+    deploy_token_type { DeployToken.deploy_token_types[:project_type] }
 
     trait :revoked do
       revoked { true }
@@ -21,5 +22,13 @@ FactoryBot.define do
     trait :expired do
       expires_at { Date.today - 1.month }
     end
+
+    trait :group do
+      deploy_token_type { DeployToken.deploy_token_types[:group_type] }
+    end
+
+    trait :project do
+      deploy_token_type { DeployToken.deploy_token_types[:project_type] }
+    end
   end
 end