Merge branch 'ar/update-merge-request-approval-descriptions' into 'master'

Update merge request approvals desc and links

See merge request gitlab-org/gitlab!69903

ee/app/assets/javascripts/approvals/components/group_settings/app.vue

 <script>
 import { GlSprintf, GlLink } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
-import { __ } from '~/locale';
+import { __, s__ } from '~/locale';
+
 import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue';
 import { GROUP_APPROVAL_SETTINGS_LABELS_I18N } from '../../constants';
 import ApprovalSettings from '../approval_settings.vue';
@@ -25,11 +26,16 @@ export default {
     },
   },
   links: {
-    groupSettingsDocsPath: helpPagePath('user/project/merge_requests/merge_request_approvals'),
+    groupSettingsDocsPath: helpPagePath('user/project/merge_requests/approvals/index.md'),
+    separationOfDutiesDocsPath: helpPagePath('user/compliance/compliance_report/index', {
+      anchor: 'approval-status-and-separation-of-duties',
+    }),
   },
   i18n: {
     groupSettingsHeader: __('Merge request approvals'),
-    groupSettingsDescription: __('Define approval rules. %{linkStart}Learn more.%{linkEnd}'),
+    groupSettingsDescription: s__(
+      'MergeRequestApprovals|Enforce %{separationLinkStart}separation of duties%{separationLinkEnd} for all projects. %{learnLinkStart}Learn more.%{learnLinkEnd}',
+    ),
   },
   labels: GROUP_APPROVAL_SETTINGS_LABELS_I18N,
 };
@@ -40,10 +46,21 @@ export default {
     <template #title> {{ $options.i18n.groupSettingsHeader }}</template>
     <template #description>
       <gl-sprintf :message="$options.i18n.groupSettingsDescription">
-        <template #link="{ content }">
-          <gl-link :href="$options.links.groupSettingsDocsPath" target="_blank">{{
-            content
-          }}</gl-link>
+        <template #separationLink="{ content }">
+          <gl-link
+            data-testid="group-settings-description"
+            :href="$options.links.separationOfDutiesDocsPath"
+            target="_blank"
+            >{{ content }}</gl-link
+          >
+        </template>
+        <template #learnLink="{ content }">
+          <gl-link
+            data-testid="group-settings-learn-more"
+            :href="$options.links.groupSettingsDocsPath"
+            target="_blank"
+            >{{ content }}</gl-link
+          >
         </template>
       </gl-sprintf>
     </template>

ee/app/views/admin/push_rules/_merge_request_approvals.html.haml

@@ -6,7 +6,10 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Configure approvals by authors and committers on all projects.')
+      - duties_link_url = help_page_path('user/compliance/compliance_report/index', anchor: 'approval-status-and-separation-of-duties')
+      - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: duties_link_url }
+      = s_('MergeRequestApprovals|Enforce %{link_start}separation of duties%{link_end} for all projects.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
+      = link_to _("Learn more."), help_page_path("user/project/merge_requests/approvals/index.md"), target: '_blank', rel: 'noopener noreferrer'
 
   .settings-content
     = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-merge-request-approval-settings'), html: { class: 'fieldset-form' } do |f|

ee/app/views/projects/_merge_request_approvals_settings.html.haml

@@ -6,7 +6,9 @@
     %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Merge request approvals')
     %button.gl-button.btn.btn-default.js-settings-toggle{ type: 'button' }= expanded ? _("Collapse") : _("Expand")
     %p
-      = _("Define approval rules.")
+      - duties_link_url = help_page_path('user/compliance/compliance_report/index', anchor: 'approval-status-and-separation-of-duties')
+      - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: duties_link_url }
+      = s_('MergeRequestApprovals|Define approval rules and settings to ensure %{link_start}separation of duties%{link_end} for new merge requests.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
       = link_to _("Learn more."), help_page_path("user/project/merge_requests/approvals/index.md"), target: '_blank', rel: 'noopener noreferrer'
 
   .settings-content

ee/spec/frontend/approvals/components/group_settings/app_spec.js

@@ -10,6 +10,7 @@ import { GROUP_APPROVAL_SETTINGS_LABELS_I18N } from 'ee/approvals/constants';
 import { mergeRequestApprovalSettingsMappers } from 'ee/approvals/mappers';
 import { createStoreOptions } from 'ee/approvals/stores';
 import approvalSettingsModule from 'ee/approvals/stores/modules/approval_settings';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue';
 
 const localVue = createLocalVue();
@@ -24,7 +25,8 @@ describe('EE Approvals Group Settings App', () => {
   const approvalSettingsPath = 'groups/22/merge_request_approval_settings';
 
   const createWrapper = () => {
-    wrapper = shallowMount(GroupSettingsApp, {
+    wrapper = extendedWrapper(
+      shallowMount(GroupSettingsApp, {
         localVue,
         store: new Vuex.Store(store),
         propsData: {
@@ -37,7 +39,8 @@ describe('EE Approvals Group Settings App', () => {
           GlSprintf,
           SettingsBlock,
         },
-    });
+      }),
+    );
   };
 
   beforeEach(() => {
@@ -55,7 +58,8 @@ describe('EE Approvals Group Settings App', () => {
   });
 
   const findSettingsBlock = () => wrapper.find(SettingsBlock);
-  const findLink = () => wrapper.find(GlLink);
+  const findDescriptionLink = () => wrapper.findByTestId('group-settings-description');
+  const findLearnMoreLink = () => wrapper.findByTestId('group-settings-learn-more');
   const findApprovalSettings = () => wrapper.find(ApprovalSettings);
 
   it('renders a settings block', () => {
@@ -65,14 +69,15 @@ describe('EE Approvals Group Settings App', () => {
     expect(findSettingsBlock().props('defaultExpanded')).toBe(true);
   });
 
-  it('has the correct link', () => {
+  it.each`
+    findComponent          | text                      | href
+    ${findDescriptionLink} | ${'separation of duties'} | ${'/help/user/compliance/compliance_report/index#approval-status-and-separation-of-duties'}
+    ${findLearnMoreLink}   | ${'Learn more.'}          | ${'/help/user/project/merge_requests/approvals/index.md'}
+  `('has the correct link for $text', ({ findComponent, text, href }) => {
     createWrapper();
 
-    expect(findLink().attributes()).toMatchObject({
-      href: '/help/user/project/merge_requests/merge_request_approvals',
-      target: '_blank',
-    });
-    expect(findLink().text()).toBe('Learn more.');
+    expect(findComponent().attributes()).toMatchObject({ href, target: '_blank' });
+    expect(findComponent().text()).toBe(text);
   });
 
   it('renders an approval settings component', () => {

ee/spec/views/admin/push_rules/_merge_request_approvals.html.haml_spec.rb

@@ -15,6 +15,6 @@ RSpec.describe 'admin/push_rules/_merge_request_approvals' do
     render
 
     expect(rendered).to have_content(_('Merge request approvals'))
-    expect(rendered).to have_content(_('Configure approvals by authors and committers on all projects.'))
+    expect(rendered).to have_content('Enforce separation of duties for all projects. Learn more.')
   end
 end

ee/spec/views/projects/merge_requests/_merge_request_approvals.html.haml_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'projects/_merge_request_approvals_settings' do
+  let(:project) { build(:project) }
+
+  before do
+    assign(:project, project)
+
+    allow(view).to receive(:expanded).and_return(true)
+    allow(project).to receive(:feature_available?).and_return(true)
+
+    render partial: 'projects/merge_request_approvals_settings'
+  end
+
+  it 'renders the settings title' do
+    expect(rendered).to have_content 'Merge request approvals'
+  end
+
+  it 'renders the settings app element', :aggregate_failures do
+    expect(rendered).to have_selector '#js-mr-approvals-settings'
+  end
+
+  it 'renders the loading spinner' do
+    expect(rendered).to have_selector '.gl-spinner'
+  end
+end

locale/gitlab.pot

@@ -8644,9 +8644,6 @@ msgstr ""
 msgid "Configure advanced permissions, Large File Storage, and two-factor authentication settings."
 msgstr ""
 
-msgid "Configure approvals by authors and committers on all projects."
-msgstr ""
-
 msgid "Configure existing installation"
 msgstr ""
 
@@ -10909,12 +10906,6 @@ msgstr ""
 msgid "Define a custom pattern with cron syntax"
 msgstr ""
 
-msgid "Define approval rules."
-msgstr ""
-
-msgid "Define approval rules. %{linkStart}Learn more.%{linkEnd}"
-msgstr ""
-
 msgid "Define custom rules for what constitutes spam, independent of Akismet"
 msgstr ""
 
@@ -21561,6 +21552,15 @@ msgstr ""
 msgid "MergeRequestAnalytics|Time to merge"
 msgstr ""
 
+msgid "MergeRequestApprovals|Define approval rules and settings to ensure %{link_start}separation of duties%{link_end} for new merge requests."
+msgstr ""
+
+msgid "MergeRequestApprovals|Enforce %{link_start}separation of duties%{link_end} for all projects."
+msgstr ""
+
+msgid "MergeRequestApprovals|Enforce %{separationLinkStart}separation of duties%{separationLinkEnd} for all projects. %{learnLinkStart}Learn more.%{learnLinkEnd}"
+msgstr ""
+
 msgid "MergeRequestDiffs|Commenting on lines %{selectStart}start%{selectEnd} to %{end}"
 msgstr ""