Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 1 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 224f460488b..c44eef0ab37 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -694,7 +694,7 @@ FactoryBot.define do
       end
     end
 
-    trait :non_public_artifacts do
+    trait :with_private_artifacts_config do
       options do
         {
           artifacts: { public: false }
@@ -702,6 +702,14 @@ FactoryBot.define do
       end
     end
 
+    trait :with_public_artifacts_config do
+      options do
+        {
+          artifacts: { public: true }
+        }
+      end
+    end
+
     trait :non_playable do
       status { 'created' }
       self.when { 'manual' }
diff --git a/spec/factories/service_desk/custom_email_verification.rb b/spec/factories/service_desk/custom_email_verification.rb
new file mode 100644
index 00000000000..614be5da71e
--- /dev/null
+++ b/spec/factories/service_desk/custom_email_verification.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :service_desk_custom_email_verification, class: '::ServiceDesk::CustomEmailVerification' do
+    project
+    state { "running" }
+  end
+end