Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 22 deletions

diff --git a/spec/models/ci/build_dependencies_spec.rb b/spec/models/ci/build_dependencies_spec.rb
index 6db69d0f34c..8f2199ac360 100644
--- a/spec/models/ci/build_dependencies_spec.rb
+++ b/spec/models/ci/build_dependencies_spec.rb
@@ -96,14 +96,6 @@ describe Ci::BuildDependencies do
         end
 
         it { is_expected.to contain_exactly(build, rspec_test, staging) }
-
-        context 'when ci_dag_support is disabled' do
-          before do
-            stub_feature_flags(ci_dag_support: false)
-          end
-
-          it { is_expected.to contain_exactly(build, rspec_test, rubocop_test, staging) }
-        end
       end
 
       context 'when need artifacts are defined' do
diff --git a/spec/models/ci/processable_spec.rb b/spec/models/ci/processable_spec.rb
index e03f54aa728..e8ef7b29681 100644
--- a/spec/models/ci/processable_spec.rb
+++ b/spec/models/ci/processable_spec.rb
@@ -25,20 +25,6 @@ describe Ci::Processable do
         it 'returns all needs' do
           expect(with_aggregated_needs.first.aggregated_needs_names).to contain_exactly('test1', 'test2')
         end
-
-        context 'with ci_dag_support disabled' do
-          before do
-            stub_feature_flags(ci_dag_support: false)
-          end
-
-          it 'returns all processables' do
-            expect(with_aggregated_needs).to contain_exactly(processable)
-          end
-
-          it 'returns empty needs' do
-            expect(with_aggregated_needs.first.aggregated_needs_names).to be_nil
-          end
-        end
       end
 
       context 'without needs' do