Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 30 insertions, 12 deletions

diff --git a/spec/services/ci/play_manual_stage_service_spec.rb b/spec/services/ci/play_manual_stage_service_spec.rb
index e30ec8bfda5..3e2a95ee975 100644
--- a/spec/services/ci/play_manual_stage_service_spec.rb
+++ b/spec/services/ci/play_manual_stage_service_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Ci::PlayManualStageService, '#execute' do
   let(:current_user) { create(:user) }
   let(:pipeline) { create(:ci_pipeline, user: current_user) }
   let(:project) { pipeline.project }
+  let(:downstream_project) { create(:project) }
   let(:service) { described_class.new(project, current_user, pipeline: pipeline) }
   let(:stage_status) { 'manual' }
 
@@ -18,40 +19,42 @@ RSpec.describe Ci::PlayManualStageService, '#execute' do
 
   before do
     project.add_maintainer(current_user)
+    downstream_project.add_maintainer(current_user)
     create_builds_for_stage(status: stage_status)
+    create_bridge_for_stage(status: stage_status)
   end
 
-  context 'when pipeline has manual builds' do
+  context 'when pipeline has manual processables' do
     before do
       service.execute(stage)
     end
 
-    it 'starts manual builds from pipeline' do
-      expect(pipeline.builds.manual.count).to eq(0)
+    it 'starts manual processables from pipeline' do
+      expect(pipeline.processables.manual.count).to eq(0)
     end
 
-    it 'updates manual builds' do
-      pipeline.builds.each do |build|
-        expect(build.user).to eq(current_user)
+    it 'updates manual processables' do
+      pipeline.processables.each do |processable|
+        expect(processable.user).to eq(current_user)
       end
     end
   end
 
-  context 'when pipeline has no manual builds' do
+  context 'when pipeline has no manual processables' do
     let(:stage_status) { 'failed' }
 
     before do
       service.execute(stage)
     end
 
-    it 'does not update the builds' do
-      expect(pipeline.builds.failed.count).to eq(3)
+    it 'does not update the processables' do
+      expect(pipeline.processables.failed.count).to eq(4)
     end
   end
 
-  context 'when user does not have permission on a specific build' do
+  context 'when user does not have permission on a specific processable' do
     before do
-      allow_next_instance_of(Ci::Build) do |instance|
+      allow_next_instance_of(Ci::Processable) do |instance|
         allow(instance).to receive(:play).and_raise(Gitlab::Access::AccessDeniedError)
       end
 
@@ -60,12 +63,14 @@ RSpec.describe Ci::PlayManualStageService, '#execute' do
 
     it 'logs the error' do
       expect(Gitlab::AppLogger).to receive(:error)
-        .exactly(stage.builds.manual.count)
+        .exactly(stage.processables.manual.count)
 
       service.execute(stage)
     end
   end
 
+  private
+
   def create_builds_for_stage(options)
     options.merge!({
       when: 'manual',
@@ -77,4 +82,17 @@ RSpec.describe Ci::PlayManualStageService, '#execute' do
 
     create_list(:ci_build, 3, options)
   end
+
+  def create_bridge_for_stage(options)
+    options.merge!({
+      when: 'manual',
+      pipeline: pipeline,
+      stage: stage.name,
+      stage_id: stage.id,
+      user: pipeline.user,
+      downstream: downstream_project
+    })
+
+    create(:ci_bridge, options)
+  end
 end