Add latest changes from gitlab-org/gitlab@master

2 files changed, 38 insertions, 0 deletions

diff --git a/spec/factories/ci/test_case.rb b/spec/factories/ci/test_case.rb
new file mode 100644
index 00000000000..8017111bcc7
--- /dev/null
+++ b/spec/factories/ci/test_case.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :test_case, class: 'Gitlab::Ci::Reports::TestCase' do
+    name { "test-1" }
+    classname { "trace" }
+    file { "spec/trace_spec.rb" }
+    execution_time { 1.23 }
+    status { "success" }
+    system_output { nil }
+    attachment { nil }
+
+    trait :with_attachment do
+      attachment { "some/path.png" }
+    end
+
+    skip_create
+
+    initialize_with do
+      new(
+        name: name,
+        classname: classname,
+        file: file,
+        execution_time: execution_time,
+        status: status,
+        system_output: system_output,
+        attachment: attachment
+      )
+    end
+  end
+end
diff --git a/spec/factories/user_highest_roles.rb b/spec/factories/user_highest_roles.rb
new file mode 100644
index 00000000000..2e3447348b7
--- /dev/null
+++ b/spec/factories/user_highest_roles.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :user_highest_role do
+    user
+  end
+end