Add latest changes from gitlab-org/gitlab@master

2 files changed, 78 insertions, 22 deletions

diff --git a/spec/services/test_hooks/project_service_spec.rb b/spec/services/test_hooks/project_service_spec.rb
index ab7570bed2f..f1b22c07225 100644
--- a/spec/services/test_hooks/project_service_spec.rb
+++ b/spec/services/test_hooks/project_service_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe TestHooks::ProjectService do
+  include AfterNextHelpers
+
   let(:current_user) { create(:user) }
 
   describe '#execute' do
@@ -64,9 +66,7 @@ RSpec.describe TestHooks::ProjectService do
         create(:note, project: project)
 
         allow(Gitlab::DataBuilder::Note).to receive(:build).and_return(sample_data)
-        allow_next_instance_of(NotesFinder) do |finder|
-          allow(finder).to receive(:execute).and_return(Note.all)
-        end
+        allow_next(NotesFinder).to receive(:execute).and_return(Note.all)
 
         expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
         expect(service.execute).to include(success_result)
@@ -83,9 +83,7 @@ RSpec.describe TestHooks::ProjectService do
 
       it 'executes hook' do
         allow(issue).to receive(:to_hook_data).and_return(sample_data)
-        allow_next_instance_of(IssuesFinder) do |finder|
-          allow(finder).to receive(:execute).and_return([issue])
-        end
+        allow_next(IssuesFinder).to receive(:execute).and_return([issue])
 
         expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
         expect(service.execute).to include(success_result)
@@ -118,9 +116,7 @@ RSpec.describe TestHooks::ProjectService do
 
       it 'executes hook' do
         allow(merge_request).to receive(:to_hook_data).and_return(sample_data)
-        allow_next_instance_of(MergeRequestsFinder) do |finder|
-          allow(finder).to receive(:execute).and_return([merge_request])
-        end
+        allow_next(MergeRequestsFinder).to receive(:execute).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)
@@ -130,6 +126,7 @@ RSpec.describe TestHooks::ProjectService do
     context 'job_events' do
       let(:trigger) { 'job_events' }
       let(:trigger_key) { :job_hooks }
+      let(:ci_job) { build(:ci_build) }
 
       it 'returns error message if not enough data' do
         expect(hook).not_to receive(:execute)
@@ -137,17 +134,33 @@ RSpec.describe TestHooks::ProjectService do
       end
 
       it 'executes hook' do
-        create(:ci_build, project: project)
         allow(Gitlab::DataBuilder::Build).to receive(:build).and_return(sample_data)
+        allow_next(Ci::JobsFinder).to receive(:execute).and_return([ci_job])
 
         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 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::Build).to receive(:build).and_return(sample_data)
+
+          expect(Ci::JobsFinder).not_to receive(:new)
+          expect(project).to receive(:builds).and_return([ci_job])
+          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 'pipeline_events' do
       let(:trigger) { 'pipeline_events' }
       let(:trigger_key) { :pipeline_hooks }
+      let(:pipeline) { build(:ci_empty_pipeline) }
 
       it 'returns error message if not enough data' do
         expect(hook).not_to receive(:execute)
@@ -155,12 +168,27 @@ RSpec.describe TestHooks::ProjectService do
       end
 
       it 'executes hook' do
-        create(:ci_empty_pipeline, project: project)
         allow(Gitlab::DataBuilder::Pipeline).to receive(:build).and_return(sample_data)
+        allow_next(Ci::PipelinesFinder).to receive(:execute).and_return([pipeline])
 
         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 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(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
+          expect(service.execute).to include(success_result)
+        end
+      end
     end
 
     context 'wiki_page_events' do
@@ -192,6 +220,7 @@ RSpec.describe TestHooks::ProjectService do
     context 'releases_events' do
       let(:trigger) { 'releases_events' }
       let(:trigger_key) { :release_hooks }
+      let(:release) { build(:release) }
 
       it 'returns error message if not enough data' do
         expect(hook).not_to receive(:execute)
@@ -199,12 +228,27 @@ RSpec.describe TestHooks::ProjectService do
       end
 
       it 'executes hook' do
-        allow(project).to receive(:releases).and_return([Release.new])
-        allow_any_instance_of(Release).to receive(:to_hook_data).and_return(sample_data)
+        allow(release).to receive(:to_hook_data).and_return(sample_data)
+        allow_next(ReleasesFinder).to receive(:execute).and_return([release])
 
         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 reorder feature flag is disabled' do
+        before do
+          stub_feature_flags(integrations_test_webhook_reorder: false)
+        end
+
+        it 'executes the old query' do
+          allow(release).to receive(:to_hook_data).and_return(sample_data)
+
+          expect(ReleasesFinder).not_to receive(:new)
+          expect(project).to receive(:releases).and_return([release])
+          expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
+          expect(service.execute).to include(success_result)
+        end
+      end
     end
   end
 end
diff --git a/spec/services/test_hooks/system_service_spec.rb b/spec/services/test_hooks/system_service_spec.rb
index 34dd2173b09..67ae0f9d6db 100644
--- a/spec/services/test_hooks/system_service_spec.rb
+++ b/spec/services/test_hooks/system_service_spec.rb
@@ -3,12 +3,12 @@
 require 'spec_helper'
 
 RSpec.describe TestHooks::SystemService do
-  let(:current_user) { create(:user) }
+  include AfterNextHelpers
 
   describe '#execute' do
-    let(:project) { create(:project, :repository) }
+    let_it_be(:project) { create(:project, :repository) }
     let(:hook)    { create(:system_hook) }
-    let(:service) { described_class.new(hook, current_user, trigger) }
+    let(:service) { described_class.new(hook, project.owner, trigger) }
     let(:success_result) { { status: :success, http_status: 200, message: 'ok' } }
 
     before do
@@ -63,6 +63,9 @@ RSpec.describe TestHooks::SystemService do
 
     context 'merge_requests_events' do
       let(:trigger) { 'merge_requests_events' }
+      let(:trigger_key) { :merge_request_hooks }
+      let(:merge_requests) { build_list(:merge_request, 2) }
+      let(:sample_data) { { data: 'sample' } }
 
       it 'returns error message if the user does not have any repository with a merge request' do
         expect(hook).not_to receive(:execute)
@@ -70,15 +73,24 @@ RSpec.describe TestHooks::SystemService do
       end
 
       it 'executes hook' do
-        trigger_key = :merge_request_hooks
-        sample_data = { data: 'sample' }
-        create(:project_member, user: current_user, project: project)
-        create(:merge_request, source_project: project)
-        allow_any_instance_of(MergeRequest).to receive(:to_hook_data).and_return(sample_data)
-
+        expect(MergeRequest).to receive(:of_projects).and_return(merge_requests)
+        expect(merge_requests.last).to receive(:to_hook_data).and_return(sample_data)
         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 reorder feature flag is disabled' do
+        before do
+          stub_feature_flags(integrations_test_webhook_reorder: false)
+        end
+
+        it 'executes the old query' do
+          expect(MergeRequest).to receive(:of_projects).and_return(merge_requests)
+          expect(merge_requests.first).to receive(:to_hook_data).and_return(sample_data)
+          expect(hook).to receive(:execute).with(sample_data, trigger_key).and_return(success_result)
+          expect(service.execute).to include(success_result)
+        end
+      end
     end
   end
 end