Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 52 deletions

diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 86c3628216e..cf1690df9ba 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -2932,30 +2932,6 @@ describe Ci::Pipeline, :mailer do
           create(:ci_sources_pipeline, pipeline: pipeline, source_job: bridge)
         end
 
-        context 'when downstream pipeline status transitions to pending' do
-          it 'updates bridge status ' do
-            expect(pipeline).to receive(:update_bridge_status!).once
-
-            pipeline.run!
-          end
-        end
-
-        context 'when the status of downstream pipeline transitions to waiting_for_resource' do
-          it 'updates bridge status ' do
-            expect(pipeline).to receive(:update_bridge_status!).once
-
-            pipeline.request_resource!
-          end
-        end
-
-        context 'when the status of downstream pipeline transitions to failed' do
-          it 'does not update bridge status ' do
-            expect(pipeline).not_to receive(:update_bridge_status!)
-
-            pipeline.drop!
-          end
-        end
-
         describe '#bridge_triggered?' do
           it 'is a pipeline triggered by a bridge' do
             expect(pipeline).to be_bridge_triggered
diff --git a/spec/services/ci/create_cross_project_pipeline_service_spec.rb b/spec/services/ci/create_cross_project_pipeline_service_spec.rb
index 3625bc6ff41..51cf18f8d87 100644
--- a/spec/services/ci/create_cross_project_pipeline_service_spec.rb
+++ b/spec/services/ci/create_cross_project_pipeline_service_spec.rb
@@ -267,34 +267,6 @@ describe Ci::CreateCrossProjectPipelineService, '#execute' do
       end
     end
 
-    context 'when downstream pipeline creation errors out' do
-      let(:stub_config) { false }
-
-      before do
-        stub_ci_pipeline_yaml_file(YAML.dump(invalid: { yaml: 'error' }))
-      end
-
-      it 'creates only one new pipeline' do
-        expect { service.execute(bridge) }
-          .to change { Ci::Pipeline.count }.by(1)
-      end
-
-      it 'creates a new pipeline in the downstream project' do
-        pipeline = service.execute(bridge)
-
-        expect(pipeline.user).to eq bridge.user
-        expect(pipeline.project).to eq downstream_project
-      end
-
-      it 'drops the bridge' do
-        pipeline = service.execute(bridge)
-
-        expect(pipeline.reload).to be_failed
-        expect(bridge.reload).to be_failed
-        expect(bridge.failure_reason).to eq('downstream_pipeline_creation_failed')
-      end
-    end
-
     context 'when bridge job has YAML variables defined' do
       before do
         bridge.yaml_variables = [{ key: 'BRIDGE', value: 'var', public: true }]