Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 45 deletions

diff --git a/spec/services/test_hooks/project_service_spec.rb b/spec/services/test_hooks/project_service_spec.rb
index 247270474bf..ab7570bed2f 100644
--- a/spec/services/test_hooks/project_service_spec.rb
+++ b/spec/services/test_hooks/project_service_spec.rb
@@ -71,21 +71,6 @@ RSpec.describe TestHooks::ProjectService do
         expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
         expect(service.execute).to include(success_result)
       end
-
-      context 'when the query optimization feature flag is disabled' do
-        before do
-          stub_feature_flags(integrations_test_webhook_optimizations: false)
-        end
-
-        it 'executes the old query' do
-          allow(Gitlab::DataBuilder::Note).to receive(:build).and_return(sample_data)
-
-          expect(NotesFinder).not_to receive(:new)
-          expect(project).to receive(:notes).and_return([Note.new])
-          expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
-          expect(service.execute).to include(success_result)
-        end
-      end
     end
 
     shared_examples_for 'a test webhook that operates on issues' do
@@ -105,21 +90,6 @@ RSpec.describe TestHooks::ProjectService do
         expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
         expect(service.execute).to include(success_result)
       end
-
-      context 'when the query optimization feature flag is disabled' do
-        before do
-          stub_feature_flags(integrations_test_webhook_optimizations: false)
-        end
-
-        it 'executes the old query' do
-          allow(issue).to receive(:to_hook_data).and_return(sample_data)
-
-          expect(IssuesFinder).not_to receive(:new)
-          expect(project).to receive(:issues).and_return([issue])
-          expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
-          expect(service.execute).to include(success_result)
-        end
-      end
     end
 
     context 'issues_events' do
@@ -155,21 +125,6 @@ RSpec.describe TestHooks::ProjectService do
         expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
         expect(service.execute).to include(success_result)
       end
-
-      context 'when the query optimization feature flag is disabled' do
-        before do
-          stub_feature_flags(integrations_test_webhook_optimizations: false)
-        end
-
-        it 'executes the old query' do
-          allow(merge_request).to receive(:to_hook_data).and_return(sample_data)
-
-          expect(MergeRequestsFinder).not_to receive(:new)
-          expect(project).to receive(:merge_requests).and_return([merge_request])
-          expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
-          expect(service.execute).to include(success_result)
-        end
-      end
     end
 
     context 'job_events' do