From e3e300557f5def9bf2271735c8a620e6820dfada Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 8 Jan 2020 12:07:59 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../ci/pipeline/chain/config/content_spec.rb       | 53 ----------------------
 1 file changed, 53 deletions(-)

(limited to 'spec/lib/gitlab/ci/pipeline/chain/config')

diff --git a/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb
index 4c4359ad5d2..aaea044595f 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/config/content_spec.rb
@@ -15,42 +15,6 @@ describe Gitlab::Ci::Pipeline::Chain::Config::Content do
         stub_feature_flags(ci_root_config_content: false)
       end
 
-      context 'when bridge job is passed in as parameter' do
-        let(:ci_config_path) { nil }
-        let(:bridge) { create(:ci_bridge) }
-
-        before do
-          command.bridge = bridge
-        end
-
-        context 'when bridge job has downstream yaml' do
-          before do
-            allow(bridge).to receive(:yaml_for_downstream).and_return('the-yaml')
-          end
-
-          it 'returns the content already available in command' do
-            subject.perform!
-
-            expect(pipeline.config_source).to eq 'bridge_source'
-            expect(command.config_content).to eq 'the-yaml'
-          end
-        end
-
-        context 'when bridge job does not have downstream yaml' do
-          before do
-            allow(bridge).to receive(:yaml_for_downstream).and_return(nil)
-          end
-
-          it 'returns the next available source' do
-            subject.perform!
-
-            expect(pipeline.config_source).to eq 'auto_devops_source'
-            template = Gitlab::Template::GitlabCiYmlTemplate.find('Beta/Auto-DevOps')
-            expect(command.config_content).to eq(template.content)
-          end
-        end
-      end
-
       context 'when config is defined in a custom path in the repository' do
         let(:ci_config_path) { 'path/to/config.yml' }
 
@@ -171,23 +135,6 @@ describe Gitlab::Ci::Pipeline::Chain::Config::Content do
       end
     end
 
-    context 'when bridge job is passed in as parameter' do
-      let(:ci_config_path) { nil }
-      let(:bridge) { create(:ci_bridge) }
-
-      before do
-        command.bridge = bridge
-        allow(bridge).to receive(:yaml_for_downstream).and_return('the-yaml')
-      end
-
-      it 'returns the content already available in command' do
-        subject.perform!
-
-        expect(pipeline.config_source).to eq 'bridge_source'
-        expect(command.config_content).to eq 'the-yaml'
-      end
-    end
-
     context 'when config is defined in a custom path in the repository' do
       let(:ci_config_path) { 'path/to/config.yml' }
       let(:config_content_result) do
-- 
cgit v1.2.1