Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

3 files changed, 104 insertions, 73 deletions

diff --git a/spec/models/integrations/asana_spec.rb b/spec/models/integrations/asana_spec.rb
index f7e7eb1b0ae..b6602964182 100644
--- a/spec/models/integrations/asana_spec.rb
+++ b/spec/models/integrations/asana_spec.rb
@@ -14,27 +14,29 @@ RSpec.describe Integrations::Asana do
   end
 
   describe 'Execute' do
-    let(:user) { create(:user) }
-    let(:project) { create(:project) }
+    let_it_be(:user) { create(:user) }
+    let_it_be(:project) { create(:project) }
+
     let(:gid) { "123456789ABCD" }
+    let(:asana_task) { double(::Asana::Resources::Task) }
+    let(:asana_integration) { described_class.new }
 
-    def create_data_for_commits(*messages)
+    let(:data) do
       {
         object_kind: 'push',
         ref: 'master',
         user_name: user.name,
-        commits: messages.map do |m|
+        commits: [
           {
-            message: m,
+            message: message,
             url: 'https://gitlab.com/'
           }
-        end
+        ]
       }
     end
 
     before do
-      @asana = described_class.new
-      allow(@asana).to receive_messages(
+      allow(asana_integration).to receive_messages(
         project: project,
         project_id: project.id,
         api_key: 'verySecret',
@@ -42,67 +44,79 @@ RSpec.describe Integrations::Asana do
       )
     end
 
-    it 'calls Asana integration to create a story' do
-      data = create_data_for_commits("Message from commit. related to ##{gid}")
-      expected_message = "#{data[:user_name]} pushed to branch #{data[:ref]} of #{project.full_name} ( #{data[:commits][0][:url]} ): #{data[:commits][0][:message]}"
+    subject(:execute_integration) { asana_integration.execute(data) }
+
+    context 'when creating a story' do
+      let(:message) { "Message from commit. related to ##{gid}" }
+      let(:expected_message) do
+        "#{user.name} pushed to branch master of #{project.full_name} ( https://gitlab.com/ ): #{message}"
+      end
 
-      d1 = double('Asana::Resources::Task')
-      expect(d1).to receive(:add_comment).with(text: expected_message)
-      expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, gid).once.and_return(d1)
+      it 'calls Asana integration to create a story' do
+        expect(asana_task).to receive(:add_comment).with(text: expected_message)
+        expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, gid).once.and_return(asana_task)
 
-      @asana.execute(data)
+        execute_integration
+      end
     end
 
-    it 'calls Asana integration to create a story and close a task' do
-      data = create_data_for_commits('fix #456789')
-      d1 = double('Asana::Resources::Task')
-      expect(d1).to receive(:add_comment)
-      expect(d1).to receive(:update).with(completed: true)
-      expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '456789').once.and_return(d1)
+    context 'when creating a story and closing a task' do
+      let(:message) { 'fix #456789' }
 
-      @asana.execute(data)
+      it 'calls Asana integration to create a story and close a task' do
+        expect(asana_task).to receive(:add_comment)
+        expect(asana_task).to receive(:update).with(completed: true)
+        expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '456789').once.and_return(asana_task)
+
+        execute_integration
+      end
     end
 
-    it 'is able to close via url' do
-      data = create_data_for_commits('closes https://app.asana.com/19292/956299/42')
-      d1 = double('Asana::Resources::Task')
-      expect(d1).to receive(:add_comment)
-      expect(d1).to receive(:update).with(completed: true)
-      expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d1)
+    context 'when closing via url' do
+      let(:message) { 'closes https://app.asana.com/19292/956299/42' }
 
-      @asana.execute(data)
+      it 'calls Asana integration to close via url' do
+        expect(asana_task).to receive(:add_comment)
+        expect(asana_task).to receive(:update).with(completed: true)
+        expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '42').once.and_return(asana_task)
+
+        execute_integration
+      end
     end
 
-    it 'allows multiple matches per line' do
-      message = <<-EOF
-      minor bigfix, refactoring, fixed #123 and Closes #456 work on #789
-      ref https://app.asana.com/19292/956299/42 and closing https://app.asana.com/19292/956299/12
-      EOF
-      data = create_data_for_commits(message)
-      d1 = double('Asana::Resources::Task')
-      expect(d1).to receive(:add_comment)
-      expect(d1).to receive(:update).with(completed: true)
-      expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '123').once.and_return(d1)
-
-      d2 = double('Asana::Resources::Task')
-      expect(d2).to receive(:add_comment)
-      expect(d2).to receive(:update).with(completed: true)
-      expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '456').once.and_return(d2)
-
-      d3 = double('Asana::Resources::Task')
-      expect(d3).to receive(:add_comment)
-      expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '789').once.and_return(d3)
-
-      d4 = double('Asana::Resources::Task')
-      expect(d4).to receive(:add_comment)
-      expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d4)
-
-      d5 = double('Asana::Resources::Task')
-      expect(d5).to receive(:add_comment)
-      expect(d5).to receive(:update).with(completed: true)
-      expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '12').once.and_return(d5)
-
-      @asana.execute(data)
+    context 'with multiple matches per line' do
+      let(:message) do
+        <<-EOF
+        minor bigfix, refactoring, fixed #123 and Closes #456 work on #789
+        ref https://app.asana.com/19292/956299/42 and closing https://app.asana.com/19292/956299/12
+        EOF
+      end
+
+      it 'allows multiple matches per line' do
+        expect(asana_task).to receive(:add_comment)
+        expect(asana_task).to receive(:update).with(completed: true)
+        expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '123').once.and_return(asana_task)
+
+        asana_task_2 = double(Asana::Resources::Task)
+        expect(asana_task_2).to receive(:add_comment)
+        expect(asana_task_2).to receive(:update).with(completed: true)
+        expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '456').once.and_return(asana_task_2)
+
+        asana_task_3 = double(Asana::Resources::Task)
+        expect(asana_task_3).to receive(:add_comment)
+        expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '789').once.and_return(asana_task_3)
+
+        asana_task_4 = double(Asana::Resources::Task)
+        expect(asana_task_4).to receive(:add_comment)
+        expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '42').once.and_return(asana_task_4)
+
+        asana_task_5 = double(Asana::Resources::Task)
+        expect(asana_task_5).to receive(:add_comment)
+        expect(asana_task_5).to receive(:update).with(completed: true)
+        expect(::Asana::Resources::Task).to receive(:find_by_id).with(anything, '12').once.and_return(asana_task_5)
+
+        execute_integration
+      end
     end
   end
 end
diff --git a/spec/models/integrations/datadog_spec.rb b/spec/models/integrations/datadog_spec.rb
index 9c3ff7aa35b..9856c53a390 100644
--- a/spec/models/integrations/datadog_spec.rb
+++ b/spec/models/integrations/datadog_spec.rb
@@ -38,6 +38,11 @@ RSpec.describe Integrations::Datadog do
 
   let(:pipeline_data) { Gitlab::DataBuilder::Pipeline.build(pipeline) }
   let(:build_data) { Gitlab::DataBuilder::Build.build(build) }
+  let(:archive_trace_data) do
+    create(:ci_job_artifact, :trace, job: build)
+
+    Gitlab::DataBuilder::ArchiveTrace.build(build)
+  end
 
   it_behaves_like Integrations::HasWebHook do
     let(:integration) { instance }
@@ -100,6 +105,13 @@ RSpec.describe Integrations::Datadog do
     end
   end
 
+  describe '#help' do
+    subject { instance.help }
+
+    it { is_expected.to be_a(String) }
+    it { is_expected.not_to be_empty }
+  end
+
   describe '#hook_url' do
     subject { instance.hook_url }
 
@@ -161,13 +173,16 @@ RSpec.describe Integrations::Datadog do
     end
 
     before do
+      stub_feature_flags(datadog_integration_logs_collection: enable_logs_collection)
       stub_request(:post, expected_hook_url)
       saved_instance.execute(data)
     end
 
+    let(:enable_logs_collection) { true }
+
     context 'with pipeline data' do
       let(:data) { pipeline_data }
-      let(:expected_headers) { { WebHookService::GITLAB_EVENT_HEADER => 'Pipeline Hook' } }
+      let(:expected_headers) { { ::Gitlab::WebHooks::GITLAB_EVENT_HEADER => 'Pipeline Hook' } }
       let(:expected_body) { data.with_retried_builds.to_json }
 
       it { expect(a_request(:post, expected_hook_url).with(headers: expected_headers, body: expected_body)).to have_been_made }
@@ -175,10 +190,24 @@ RSpec.describe Integrations::Datadog do
 
     context 'with job data' do
       let(:data) { build_data }
-      let(:expected_headers) { { WebHookService::GITLAB_EVENT_HEADER => 'Job Hook' } }
+      let(:expected_headers) { { ::Gitlab::WebHooks::GITLAB_EVENT_HEADER => 'Job Hook' } }
+      let(:expected_body) { data.to_json }
+
+      it { expect(a_request(:post, expected_hook_url).with(headers: expected_headers, body: expected_body)).to have_been_made }
+    end
+
+    context 'with archive trace data' do
+      let(:data) { archive_trace_data }
+      let(:expected_headers) { { ::Gitlab::WebHooks::GITLAB_EVENT_HEADER => 'Archive Trace Hook' } }
       let(:expected_body) { data.to_json }
 
       it { expect(a_request(:post, expected_hook_url).with(headers: expected_headers, body: expected_body)).to have_been_made }
+
+      context 'but feature flag disabled' do
+        let(:enable_logs_collection) { false }
+
+        it { expect(a_request(:post, expected_hook_url)).not_to have_been_made }
+      end
     end
   end
 end
diff --git a/spec/models/integrations/jira_spec.rb b/spec/models/integrations/jira_spec.rb
index 9163a7ef845..e80fa6e3b70 100644
--- a/spec/models/integrations/jira_spec.rb
+++ b/spec/models/integrations/jira_spec.rb
@@ -937,18 +937,6 @@ RSpec.describe Integrations::Jira do
         end
       end
 
-      context 'with jira_use_first_ref_by_oid feature flag disabled' do
-        before do
-          stub_feature_flags(jira_use_first_ref_by_oid: false)
-        end
-
-        it 'creates a comment and remote link on Jira' do
-          expect(subject).to eq(success_message)
-          expect(WebMock).to have_requested(:post, comment_url).with(body: comment_body).once
-          expect(WebMock).to have_requested(:post, remote_link_url).once
-        end
-      end
-
       it 'tracks usage' do
         expect(Gitlab::UsageDataCounters::HLLRedisCounter)
           .to receive(:track_event)