Add factory for parsers. Add required specification in json schema matcher. Improved test code.

3 files changed, 8 insertions, 10 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 8bd1f1ae4e0..9813190925b 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -188,9 +188,8 @@ FactoryBot.define do
     end
 
     trait :test_reports do
-      after(:create) do |build|
-        create(:ci_job_artifact, :junit, job: build)
-        build.reload
+      after(:build) do |build|
+        build.job_artifacts << create(:ci_job_artifact, :junit, job: build)
       end
     end
 
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb
index 457fcbad620..a6ff226fa75 100644
--- a/spec/factories/ci/pipelines.rb
+++ b/spec/factories/ci/pipelines.rb
@@ -70,11 +70,11 @@ FactoryBot.define do
         protected true
       end
 
-      trait :test_reports do
+      trait :with_test_reports do
         status :success
 
         after(:build) do |pipeline, evaluator|
-          create(:ci_build, :test_reports, pipeline: pipeline, project: pipeline.project)
+          pipeline.builds << build(:ci_build, :test_reports, pipeline: pipeline, project: pipeline.project)
         end
       end
     end
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 4c36ec8ec58..3268b607a76 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -90,15 +90,14 @@ FactoryBot.define do
     end
 
     trait :with_test_reports do
-      after(:create) do |merge_request|
-        create(:ci_pipeline,
+      after(:build) do |merge_request|
+        merge_request.head_pipeline = build(
+          :ci_pipeline,
           :success,
           :test_reports,
           project: merge_request.source_project,
           ref: merge_request.source_branch,
-          sha: merge_request.diff_head_sha).tap do |pipeline|
-          merge_request.update!(head_pipeline_id: pipeline.id)
-        end
+          sha: merge_request.diff_head_sha)
       end
     end