Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models/ci/bridge_spec.rb')
-rw-r--r--spec/models/ci/bridge_spec.rb28
1 files changed, 9 insertions, 19 deletions
diff --git a/spec/models/ci/bridge_spec.rb b/spec/models/ci/bridge_spec.rb
index 7b307de87c7..49b32c6f6b8 100644
--- a/spec/models/ci/bridge_spec.rb
+++ b/spec/models/ci/bridge_spec.rb
@@ -12,9 +12,7 @@ RSpec.describe Ci::Bridge, feature_category: :continuous_integration do
end
let(:bridge) do
- create(:ci_bridge, :variables, status: :created,
- options: options,
- pipeline: pipeline)
+ create(:ci_bridge, :variables, status: :created, options: options, pipeline: pipeline)
end
let(:options) do
@@ -40,16 +38,6 @@ RSpec.describe Ci::Bridge, feature_category: :continuous_integration do
it 'returns true' do
expect(bridge.retryable?).to eq(true)
end
-
- context 'without ci_recreate_downstream_pipeline ff' do
- before do
- stub_feature_flags(ci_recreate_downstream_pipeline: false)
- end
-
- it 'returns false' do
- expect(bridge.retryable?).to eq(false)
- end
- end
end
context 'when there is a pipeline loop detected' do
@@ -564,11 +552,13 @@ RSpec.describe Ci::Bridge, feature_category: :continuous_integration do
let!(:prepare2) { create(:ci_build, name: 'prepare2', pipeline: pipeline, stage_idx: 0) }
let!(:prepare3) { create(:ci_build, name: 'prepare3', pipeline: pipeline, stage_idx: 0) }
let!(:bridge) do
- create(:ci_bridge, pipeline: pipeline,
- stage_idx: 1,
- scheduling_type: 'dag',
- needs_attributes: [{ name: 'prepare1', artifacts: true },
- { name: 'prepare2', artifacts: false }])
+ create(
+ :ci_bridge,
+ pipeline: pipeline,
+ stage_idx: 1,
+ scheduling_type: 'dag',
+ needs_attributes: [{ name: 'prepare1', artifacts: true }, { name: 'prepare2', artifacts: false }]
+ )
end
let!(:job_variable_1) { create(:ci_job_variable, :dotenv_source, job: prepare1) }
@@ -581,7 +571,7 @@ RSpec.describe Ci::Bridge, feature_category: :continuous_integration do
end
end
- describe 'metadata partitioning', :ci_partitioning do
+ describe 'metadata partitioning', :ci_partitionable do
let(:pipeline) { create(:ci_pipeline, project: project, partition_id: ci_testing_partition_id) }
let(:bridge) do