diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /spec/models/ci/bridge_spec.rb | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
download | gitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'spec/models/ci/bridge_spec.rb')
-rw-r--r-- | spec/models/ci/bridge_spec.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/spec/models/ci/bridge_spec.rb b/spec/models/ci/bridge_spec.rb index 11dcecd50ca..4f09f6f1da4 100644 --- a/spec/models/ci/bridge_spec.rb +++ b/spec/models/ci/bridge_spec.rb @@ -356,14 +356,6 @@ RSpec.describe Ci::Bridge do describe '#dependency_variables' do subject { bridge.dependency_variables } - shared_context 'when ci_bridge_dependency_variables is disabled' do - before do - stub_feature_flags(ci_bridge_dependency_variables: false) - end - - it { is_expected.to be_empty } - end - context 'when downloading from previous stages' do let!(:prepare1) { create(:ci_build, name: 'prepare1', pipeline: pipeline, stage_idx: 0) } let!(:bridge) { create(:ci_bridge, pipeline: pipeline, stage_idx: 1) } @@ -374,8 +366,6 @@ RSpec.describe Ci::Bridge do it 'inherits only dependent variables' do expect(subject.to_hash).to eq(job_variable_1.key => job_variable_1.value) end - - it_behaves_like 'when ci_bridge_dependency_variables is disabled' end context 'when using needs' do @@ -397,8 +387,6 @@ RSpec.describe Ci::Bridge do it 'inherits only needs with artifacts variables' do expect(subject.to_hash).to eq(job_variable_1.key => job_variable_1.value) end - - it_behaves_like 'when ci_bridge_dependency_variables is disabled' end end end |