Add latest changes from gitlab-org/gitlab@master

4 files changed, 4 insertions, 27 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index a38935c89ba..ecb1f1996d9 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -207,14 +207,6 @@ FactoryBot.define do
       trigger_request factory: :ci_trigger_request
     end
 
-    trait :resource_group do
-      waiting_for_resource_at { 5.minutes.ago }
-
-      after(:build) do |build, evaluator|
-        build.resource_group = create(:ci_resource_group, project: build.project)
-      end
-    end
-
     after(:build) do |build, evaluator|
       build.project ||= build.pipeline.project
     end
diff --git a/spec/factories/ci/resource.rb b/spec/factories/ci/resource.rb
deleted file mode 100644
index d47b3ba4635..00000000000
--- a/spec/factories/ci/resource.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :ci_resource, class: Ci::Resource do
-    resource_group factory: :ci_resource_group
-
-    trait(:retained) do
-      build factory: :ci_build
-    end
-  end
-end
diff --git a/spec/factories/ci/resource_group.rb b/spec/factories/ci/resource_group.rb
deleted file mode 100644
index bdfc0740a45..00000000000
--- a/spec/factories/ci/resource_group.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :ci_resource_group, class: Ci::ResourceGroup do
-    project
-    sequence(:key) { |n| "IOS_#{n}" }
-  end
-end
diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb
index 2f02acca794..330f5276422 100644
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
@@ -167,6 +167,10 @@ FactoryBot.define do
       attachment { fixture_file_upload("spec/fixtures/unsanitized.svg", "image/svg+xml") }
     end
 
+    trait :with_pdf_attachment do
+      attachment { fixture_file_upload("spec/fixtures/git-cheat-sheet.pdf", "application/pdf") }
+    end
+
     transient do
       in_reply_to { nil }
     end