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

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index e46d9189c86..5e0fcb4882f 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -286,6 +286,18 @@ RSpec.describe Ci::Stage, :models do
         end
       end
 
+      context 'when stage has statuses with nil idx' do
+        before do
+          create(:ci_build, :running, stage_id: stage.id, stage_idx: nil)
+          create(:ci_build, :running, stage_id: stage.id, stage_idx: 10)
+          create(:ci_build, :running, stage_id: stage.id, stage_idx: nil)
+        end
+
+        it 'sets index to a non-empty value' do
+          expect { stage.update_legacy_status }.to change { stage.reload.position }.from(nil).to(10)
+        end
+      end
+
       context 'when stage does not have statuses' do
         it 'fallbacks to zero' do
           expect(stage.reload.position).to be_nil