Merge branch 'fix/gb/passed-with-warnings-status-on-mysql' into 'master'

Fix "passed with warnings" stage status on MySQL

Closes #28603

See merge request !9802

2 files changed, 31 insertions, 4 deletions

diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 3ea62df62f2..9962c987110 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -197,6 +197,24 @@ describe Ci::Pipeline, models: true do
           end
         end
       end
+
+      context 'when there is a stage with warnings' do
+        before do
+          create(:commit_status, pipeline: pipeline,
+                                 stage: 'deploy',
+                                 name: 'prod:2',
+                                 stage_idx: 2,
+                                 status: 'failed',
+                                 allow_failure: true)
+        end
+
+        it 'populates stage with correct number of warnings' do
+          deploy_stage = pipeline.stages.third
+
+          expect(deploy_stage).not_to receive(:statuses)
+          expect(deploy_stage).to have_warnings
+        end
+      end
     end
 
     describe '#stages_count' do
diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index c4a9743a4e2..c38faf32f7d 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -170,22 +170,31 @@ describe Ci::Stage, models: true do
     context 'when stage has warnings' do
       context 'when using memoized warnings flag' do
         context 'when there are warnings' do
-          let(:stage) { build(:ci_stage, warnings: true) }
+          let(:stage) { build(:ci_stage, warnings: 2) }
 
-          it 'has memoized warnings' do
+          it 'returns true using memoized value' do
             expect(stage).not_to receive(:statuses)
             expect(stage).to have_warnings
           end
         end
 
         context 'when there are no warnings' do
-          let(:stage) { build(:ci_stage, warnings: false) }
+          let(:stage) { build(:ci_stage, warnings: 0) }
 
-          it 'has memoized warnings' do
+          it 'returns false using memoized value' do
             expect(stage).not_to receive(:statuses)
             expect(stage).not_to have_warnings
           end
         end
+
+        context 'when number of warnings is not a valid value' do
+          let(:stage) { build(:ci_stage, warnings: true) }
+
+          it 'calculates statuses using database queries' do
+            expect(stage).to receive(:statuses).and_call_original
+            expect(stage).not_to have_warnings
+          end
+        end
       end
 
       context 'when calculating warnings from statuses' do