Add latest changes from gitlab-org/gitlab@master

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index 258403db089..8ca9ce86574 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -222,6 +222,28 @@ describe Ci::RetryBuildService do
           expect { new_build }.to change { Deployment.count }.by(1)
         end
       end
+
+      context 'when scheduling_type of build is nil' do
+        before do
+          build.update_columns(scheduling_type: nil)
+        end
+
+        context 'when build has not needs' do
+          it 'sets scheduling_type as :stage' do
+            expect(new_build.scheduling_type).to eq('stage')
+          end
+        end
+
+        context 'when build has needs' do
+          before do
+            create(:ci_build_need, build: build)
+          end
+
+          it 'sets scheduling_type as :dag' do
+            expect(new_build.scheduling_type).to eq('dag')
+          end
+        end
+      end
     end
 
     context 'when user does not have ability to execute build' do