Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 2 deletions

diff --git a/spec/factories/ci/build_report_results.rb b/spec/factories/ci/build_report_results.rb
index 00009ead126..0685c0e5554 100644
--- a/spec/factories/ci/build_report_results.rb
+++ b/spec/factories/ci/build_report_results.rb
@@ -6,7 +6,7 @@ FactoryBot.define do
     project factory: :project
     data do
       {
-        junit: {
+        tests: {
           name: "rspec",
           duration: 0.42,
           failed: 0,
@@ -20,7 +20,7 @@ FactoryBot.define do
     trait :with_junit_success do
       data do
         {
-          junit: {
+          tests: {
             name: "rspec",
             duration: 0.42,
             failed: 0,
diff --git a/spec/factories/releases/link.rb b/spec/factories/releases/link.rb
index 001deeb71a0..da0efe4a749 100644
--- a/spec/factories/releases/link.rb
+++ b/spec/factories/releases/link.rb
@@ -6,5 +6,6 @@ FactoryBot.define do
     sequence(:name) { |n| "release-18.#{n}.dmg" }
     sequence(:url) { |n| "https://example.com/scrambled-url/app-#{n}.zip" }
     sequence(:filepath) { |n| "/binaries/awesome-app-#{n}" }
+    link_type { 'other' }
   end
 end