Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 30 deletions

diff --git a/spec/services/integrations/test/project_service_spec.rb b/spec/services/integrations/test/project_service_spec.rb
index af83fa9533d..052b25b0f10 100644
--- a/spec/services/integrations/test/project_service_spec.rb
+++ b/spec/services/integrations/test/project_service_spec.rb
@@ -146,21 +146,6 @@ RSpec.describe Integrations::Test::ProjectService do
           expect(integration).to receive(:test).with(sample_data).and_return(success_result)
           expect(subject).to eq(success_result)
         end
-
-        context 'when the reorder feature flag is disabled' do
-          before do
-            stub_feature_flags(integrations_test_webhook_reorder: false)
-          end
-
-          it 'executes the old query' do
-            allow(Gitlab::DataBuilder::Deployment).to receive(:build).and_return(sample_data)
-
-            expect(DeploymentsFinder).not_to receive(:new)
-            expect(project).to receive(:deployments).and_return([deployment])
-            expect(integration).to receive(:test).with(sample_data).and_return(success_result)
-            expect(subject).to eq(success_result)
-          end
-        end
       end
 
       context 'pipeline' do
@@ -179,21 +164,6 @@ RSpec.describe Integrations::Test::ProjectService do
           expect(integration).to receive(:test).with(sample_data).and_return(success_result)
           expect(subject).to eq(success_result)
         end
-
-        context 'when the reorder feature flag is disabled' do
-          before do
-            stub_feature_flags(integrations_test_webhook_reorder: false)
-          end
-
-          it 'executes the old query' do
-            create(:ci_empty_pipeline, project: project)
-            allow(Gitlab::DataBuilder::Pipeline).to receive(:build).and_return(sample_data)
-
-            expect(Ci::PipelinesFinder).not_to receive(:new)
-            expect(integration).to receive(:test).with(sample_data).and_return(success_result)
-            expect(subject).to eq(success_result)
-          end
-        end
       end
 
       context 'wiki_page' do