Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

6 files changed, 117 insertions, 15 deletions

diff --git a/spec/models/integrations/apple_app_store_spec.rb b/spec/models/integrations/apple_app_store_spec.rb
new file mode 100644
index 00000000000..1a57f556895
--- /dev/null
+++ b/spec/models/integrations/apple_app_store_spec.rb
@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Integrations::AppleAppStore, feature_category: :mobile_devops do
+  describe 'Validations' do
+    context 'when active' do
+      before do
+        subject.active = true
+      end
+
+      it { is_expected.to validate_presence_of :app_store_issuer_id }
+      it { is_expected.to validate_presence_of :app_store_key_id }
+      it { is_expected.to validate_presence_of :app_store_private_key }
+      it { is_expected.to allow_value('aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee').for(:app_store_issuer_id) }
+      it { is_expected.not_to allow_value('abcde').for(:app_store_issuer_id) }
+      it { is_expected.to allow_value(File.read('spec/fixtures/ssl_key.pem')).for(:app_store_private_key) }
+      it { is_expected.not_to allow_value("foo").for(:app_store_private_key) }
+      it { is_expected.to allow_value('ABCD1EF12G').for(:app_store_key_id) }
+      it { is_expected.not_to allow_value('ABC').for(:app_store_key_id) }
+      it { is_expected.not_to allow_value('abc1').for(:app_store_key_id) }
+      it { is_expected.not_to allow_value('-A0-').for(:app_store_key_id) }
+    end
+  end
+
+  context 'when integration is enabled' do
+    let(:apple_app_store_integration) { build(:apple_app_store_integration) }
+
+    describe '#fields' do
+      it 'returns custom fields' do
+        expect(apple_app_store_integration.fields.pluck(:name)).to eq(%w[app_store_issuer_id app_store_key_id
+          app_store_private_key])
+      end
+    end
+
+    describe '#test' do
+      it 'returns true for a successful request' do
+        allow(AppStoreConnect::Client).to receive_message_chain(:new, :apps).and_return({})
+        expect(apple_app_store_integration.test[:success]).to be true
+      end
+
+      it 'returns false for an invalid request' do
+        allow(AppStoreConnect::Client).to receive_message_chain(:new,
+:apps).and_return({ errors: [title: "error title"] })
+        expect(apple_app_store_integration.test[:success]).to be false
+      end
+    end
+
+    describe '#help' do
+      it 'renders prompt information' do
+        expect(apple_app_store_integration.help).not_to be_empty
+      end
+    end
+
+    describe '.to_param' do
+      it 'returns the name of the integration' do
+        expect(described_class.to_param).to eq('apple_app_store')
+      end
+    end
+
+    describe '#ci_variables' do
+      let(:apple_app_store_integration) { build_stubbed(:apple_app_store_integration) }
+
+      it 'returns vars when the integration is activated' do
+        ci_vars = [
+          {
+            key: 'APP_STORE_CONNECT_API_KEY_ISSUER_ID',
+            value: apple_app_store_integration.app_store_issuer_id,
+            masked: true,
+            public: false
+          },
+          {
+            key: 'APP_STORE_CONNECT_API_KEY_KEY',
+            value: Base64.encode64(apple_app_store_integration.app_store_private_key),
+            masked: true,
+            public: false
+          },
+          {
+            key: 'APP_STORE_CONNECT_API_KEY_KEY_ID',
+            value: apple_app_store_integration.app_store_key_id,
+            masked: true,
+            public: false
+          }
+        ]
+
+        expect(apple_app_store_integration.ci_variables).to match_array(ci_vars)
+      end
+
+      it 'returns an empty array when the integration is disabled' do
+        apple_app_store_integration = build_stubbed(:apple_app_store_integration, active: false)
+        expect(apple_app_store_integration.ci_variables).to match_array([])
+      end
+    end
+  end
+
+  context 'when integration is disabled' do
+    let(:apple_app_store_integration) { build_stubbed(:apple_app_store_integration, active: false) }
+
+    describe '#ci_variables' do
+      it 'returns an empty array' do
+        expect(apple_app_store_integration.ci_variables).to match_array([])
+      end
+    end
+  end
+end
diff --git a/spec/models/integrations/base_chat_notification_spec.rb b/spec/models/integrations/base_chat_notification_spec.rb
index 67fc09fd8b5..1527ffd7278 100644
--- a/spec/models/integrations/base_chat_notification_spec.rb
+++ b/spec/models/integrations/base_chat_notification_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Integrations::BaseChatNotification do
+RSpec.describe Integrations::BaseChatNotification, feature_category: :integrations do
   describe 'default values' do
     it { expect(subject.category).to eq(:chat) }
   end
@@ -134,6 +134,12 @@ RSpec.describe Integrations::BaseChatNotification do
 
           it_behaves_like 'notifies the chat integration'
         end
+
+        context 'Incident events' do
+          let(:data) { issue.to_hook_data(user).merge!({ object_kind: 'incident' }) }
+
+          it_behaves_like 'notifies the chat integration'
+        end
       end
 
       context 'when labels_to_be_notified_behavior is not defined' do
diff --git a/spec/models/integrations/chat_message/issue_message_spec.rb b/spec/models/integrations/chat_message/issue_message_spec.rb
index ff9f30efdca..cd40e4c361e 100644
--- a/spec/models/integrations/chat_message/issue_message_spec.rb
+++ b/spec/models/integrations/chat_message/issue_message_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe Integrations::ChatMessage::IssueMessage do
 
   let(:args) do
     {
+      object_kind: 'issue',
       user: {
         name: 'Test User',
         username: 'test.user',
diff --git a/spec/models/integrations/chat_message/pipeline_message_spec.rb b/spec/models/integrations/chat_message/pipeline_message_spec.rb
index 413cb097327..4d371ca0899 100644
--- a/spec/models/integrations/chat_message/pipeline_message_spec.rb
+++ b/spec/models/integrations/chat_message/pipeline_message_spec.rb
@@ -80,18 +80,6 @@ RSpec.describe Integrations::ChatMessage::PipelineMessage do
     expect(name_field[:value]).to eq('Build pipeline')
   end
 
-  context 'when pipeline_name feature flag is disabled' do
-    before do
-      stub_feature_flags(pipeline_name: false)
-    end
-
-    it 'does not return pipeline name' do
-      name_field = subject.attachments.first[:fields].find { |a| a[:title] == 'Pipeline name' }
-
-      expect(name_field).to be nil
-    end
-  end
-
   context "when the pipeline failed" do
     before do
       args[:object_attributes][:status] = 'failed'
diff --git a/spec/models/integrations/every_integration_spec.rb b/spec/models/integrations/every_integration_spec.rb
index 33e89b3dabc..8666ef512fc 100644
--- a/spec/models/integrations/every_integration_spec.rb
+++ b/spec/models/integrations/every_integration_spec.rb
@@ -11,9 +11,9 @@ RSpec.describe 'Every integration' do
       let(:integration) { integration_class.new }
 
       context 'secret fields', :aggregate_failures do
-        it "uses type: 'password' for all secret fields" do
+        it "uses type: 'password' for all secret fields, except when bypassed" do
           integration.fields.each do |field|
-            next unless Integrations::Field::SECRET_NAME.match?(field[:name])
+            next unless Integrations::Field::SECRET_NAME.match?(field[:name]) && field[:is_secret]
 
             expect(field[:type]).to eq('password'),
               "Field '#{field[:name]}' should use type 'password'"
diff --git a/spec/models/integrations/field_spec.rb b/spec/models/integrations/field_spec.rb
index 642fb1fbf7f..c30f9ef0d7b 100644
--- a/spec/models/integrations/field_spec.rb
+++ b/spec/models/integrations/field_spec.rb
@@ -83,6 +83,8 @@ RSpec.describe ::Integrations::Field do
             be false
           when :type
             eq 'text'
+          when :is_secret
+            eq true
           else
             be_nil
           end