Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

3 files changed, 7 insertions, 11 deletions

diff --git a/spec/lib/gitlab/ci/reports/codequality_mr_diff_spec.rb b/spec/lib/gitlab/ci/reports/codequality_mr_diff_spec.rb
index 8b177fa7fc1..73b916da2e9 100644
--- a/spec/lib/gitlab/ci/reports/codequality_mr_diff_spec.rb
+++ b/spec/lib/gitlab/ci/reports/codequality_mr_diff_spec.rb
@@ -9,14 +9,11 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityMrDiff do
   let(:degradation_3) { build(:codequality_degradation_3) }
 
   describe '#initialize!' do
-    subject(:report) { described_class.new(codequality_report) }
+    subject(:report) { described_class.new(new_degradations) }
 
     context 'when quality has degradations' do
       context 'with several degradations on the same line' do
-        before do
-          codequality_report.add_degradation(degradation_1)
-          codequality_report.add_degradation(degradation_2)
-        end
+        let(:new_degradations) { [degradation_1, degradation_2] }
 
         it 'generates quality report for mr diff' do
           expect(report.files).to match(
@@ -29,11 +26,7 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityMrDiff do
       end
 
       context 'with several degradations on several files' do
-        before do
-          codequality_report.add_degradation(degradation_1)
-          codequality_report.add_degradation(degradation_2)
-          codequality_report.add_degradation(degradation_3)
-        end
+        let(:new_degradations) { [degradation_1, degradation_2, degradation_3] }
 
         it 'returns quality report for mr diff' do
           expect(report.files).to match(
@@ -50,6 +43,8 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityMrDiff do
     end
 
     context 'when quality has no degradation' do
+      let(:new_degradations) { [] }
+
       it 'returns an empty hash' do
         expect(report.files).to match({})
       end
diff --git a/spec/lib/gitlab/ci/reports/codequality_reports_comparer_spec.rb b/spec/lib/gitlab/ci/reports/codequality_reports_comparer_spec.rb
index 8378d096fcf..e289e59b281 100644
--- a/spec/lib/gitlab/ci/reports/codequality_reports_comparer_spec.rb
+++ b/spec/lib/gitlab/ci/reports/codequality_reports_comparer_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Gitlab::Ci::Reports::CodequalityReportsComparer do
   let(:base_report) { Gitlab::Ci::Reports::CodequalityReports.new }
   let(:head_report) { Gitlab::Ci::Reports::CodequalityReports.new }
   let(:major_degradation) { build(:codequality_degradation, :major) }
-  let(:minor_degradation) { build(:codequality_degradation, :major) }
+  let(:minor_degradation) { build(:codequality_degradation, :minor) }
   let(:critical_degradation) { build(:codequality_degradation, :critical) }
   let(:blocker_degradation) { build(:codequality_degradation, :blocker) }
 
diff --git a/spec/lib/gitlab/ci/reports/test_failure_history_spec.rb b/spec/lib/gitlab/ci/reports/test_failure_history_spec.rb
index 9ee55177ca0..21216241cfb 100644
--- a/spec/lib/gitlab/ci/reports/test_failure_history_spec.rb
+++ b/spec/lib/gitlab/ci/reports/test_failure_history_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe Gitlab::Ci::Reports::TestFailureHistory, :aggregate_failures do
 
   describe '#load!' do
     let_it_be(:project) { create(:project) }
+
     let(:failed_rspec) { create_test_case_rspec_failed }
     let(:failed_java) { create_test_case_java_failed }