Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

5 files changed, 67 insertions, 3 deletions

diff --git a/spec/mailers/emails/pipelines_spec.rb b/spec/mailers/emails/pipelines_spec.rb
index 3a2eb105964..1ac989cc46b 100644
--- a/spec/mailers/emails/pipelines_spec.rb
+++ b/spec/mailers/emails/pipelines_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe Emails::Pipelines do
 
       let!(:merge_request) do
         create(:merge_request, source_branch: 'master', target_branch: 'feature',
-          source_project: project, target_project: project)
+                               source_project: project, target_project: project)
       end
 
       it 'has correct information that there is no merge request link' do
@@ -56,7 +56,7 @@ RSpec.describe Emails::Pipelines do
     context 'when branch pipeline is set to a merge request as a head pipeline' do
       let(:pipeline) do
         create(:ci_pipeline, project: project, ref: ref, sha: sha,
-          merge_requests_as_head_pipeline: [merge_request])
+                             merge_requests_as_head_pipeline: [merge_request])
       end
 
       let(:merge_request) do
diff --git a/spec/mailers/emails/service_desk_spec.rb b/spec/mailers/emails/service_desk_spec.rb
index 28011456a66..1523d9b986b 100644
--- a/spec/mailers/emails/service_desk_spec.rb
+++ b/spec/mailers/emails/service_desk_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe Emails::ServiceDesk do
 
   shared_examples 'read template from repository' do |template_key|
     let(:template_content) { 'custom text' }
-    let(:issue) { create(:issue, project: project)}
+    let(:issue) { create(:issue, project: project) }
 
     before do
       issue.issue_email_participants.create!(email: email)
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 8beb54bca4d..1f53c472c5c 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -167,6 +167,17 @@ RSpec.describe Notify do
             is_expected.to have_header('X-GitLab-NotificationReason', NotificationReason::ASSIGNED)
           end
         end
+
+        context 'when sent with a non default locale' do
+          let(:email_obj) { create(:email, :confirmed, user_id: recipient.id, email: '123@abc') }
+          let(:recipient) { create(:user, preferred_language: :zh_CN) }
+
+          it 'is translated into zh_CN' do
+            recipient.notification_email = email_obj.email
+            recipient.save!
+            is_expected.to have_body_text '指派人从 <strong>Previous Assignee</strong> 更改为 <strong>John Doe</strong>'
+          end
+        end
       end
 
       describe 'that have been relabeled' do
diff --git a/spec/mailers/previews_spec.rb b/spec/mailers/previews_spec.rb
new file mode 100644
index 00000000000..14bd56e5d40
--- /dev/null
+++ b/spec/mailers/previews_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Mailer previews' do
+  # Setup needed for email previews
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, :repository, :import_failed, group: group, import_last_error: 'some error') }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:pipeline) { create(:ci_pipeline, project: project) }
+  let_it_be(:merge_request) { create(:merge_request, source_project: project) }
+  let_it_be(:milestone) { create(:milestone, project: project) }
+  let_it_be(:issue) { create(:issue, project: project, milestone: milestone) }
+  let_it_be(:remote_mirror) { create(:remote_mirror, project: project) }
+  let_it_be(:member) { create(:project_member, :maintainer, project: project, created_by: user) }
+
+  Gitlab.ee do
+    let_it_be(:epic) { create(:epic, group: group) }
+  end
+
+  let(:expected_kind) { [Mail::Message, ActionMailer::MessageDelivery] }
+
+  let(:pending_failures) do
+    {
+      'NotifyPreview#note_merge_request_email_for_diff_discussion' =>
+        'https://gitlab.com/gitlab-org/gitlab/-/issues/372885'
+    }
+  end
+
+  subject { preview.call(email) }
+
+  where(:preview, :email) do
+    ActionMailer::Preview.all.flat_map { |preview| preview.emails.map { |email| [preview, email] } }
+  end
+
+  with_them do
+    it do
+      issue_link = pending_failures["#{preview.name}##{email}"]
+      pending "See #{issue_link}" if issue_link
+
+      is_expected.to be_kind_of(Mail::Message).or(be_kind_of(ActionMailer::MessageDelivery))
+    end
+  end
+end
diff --git a/spec/mailers/repository_check_mailer_spec.rb b/spec/mailers/repository_check_mailer_spec.rb
index 8b1bc33d8be..5edd9c2d023 100644
--- a/spec/mailers/repository_check_mailer_spec.rb
+++ b/spec/mailers/repository_check_mailer_spec.rb
@@ -14,6 +14,15 @@ RSpec.describe RepositoryCheckMailer do
       expect(mail).to deliver_to admins.map(&:email)
     end
 
+    it 'email with I18n.default_locale' do
+      admins = [create(:admin, preferred_language: :zh_CN), create(:admin, preferred_language: :zh_CN)]
+
+      mail = described_class.notify(3)
+
+      expect(mail).to deliver_to admins.map(&:email)
+      expect(mail).to have_subject 'GitLab Admin | 3 projects failed their last repository check'
+    end
+
     it 'omits blocked admins' do
       blocked = create(:admin, :blocked)
       admins = create_list(:admin, 3)