Add latest changes from gitlab-org/gitlab@master

10 files changed, 156 insertions, 11 deletions

diff --git a/spec/controllers/concerns/product_analytics_tracking_spec.rb b/spec/controllers/concerns/product_analytics_tracking_spec.rb
index ed730d5c7f6..b0074b52aa2 100644
--- a/spec/controllers/concerns/product_analytics_tracking_spec.rb
+++ b/spec/controllers/concerns/product_analytics_tracking_spec.rb
@@ -8,7 +8,11 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a
 
   let(:user) { create(:user) }
   let(:event_name) { 'an_event' }
+  let(:event_action) { 'an_action' }
+  let(:event_label) { 'a_label' }
+
   let!(:group) { create(:group) }
+  let_it_be(:project) { create(:project) }
 
   before do
     allow(Gitlab::UsageDataCounters::HLLRedisCounter).to receive(:track_event)
@@ -23,6 +27,8 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a
       :index,
       :show,
       name: 'an_event',
+      action: 'an_action',
+      label: 'a_label',
       destinations: [:redis_hll, :snowplow],
       conditions: [:custom_condition_one?, :custom_condition_two?]
     ) { |controller| controller.get_custom_id }
@@ -49,6 +55,10 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a
       Group.first
     end
 
+    def tracking_project_source
+      Project.first
+    end
+
     def custom_condition_one?
       true
     end
@@ -69,7 +79,10 @@ RSpec.describe ProductAnalyticsTracking, :snowplow, feature_category: :product_a
 
     expect_snowplow_event(
       category: anything,
-      action: event_name,
+      action: event_action,
+      property: event_name,
+      label: event_label,
+      project: project,
       namespace: group,
       user: user,
       context: [context]
diff --git a/spec/features/admin/admin_health_check_spec.rb b/spec/features/admin/admin_health_check_spec.rb
index de71a48d2dc..23a9ab74a7a 100644
--- a/spec/features/admin/admin_health_check_spec.rb
+++ b/spec/features/admin/admin_health_check_spec.rb
@@ -2,8 +2,9 @@
 
 require 'spec_helper'
 
-RSpec.describe "Admin Health Check", feature_category: :continuous_verification do
+RSpec.describe "Admin Health Check", :js, feature_category: :continuous_verification do
   include StubENV
+  include Spec::Support::Helpers::ModalHelpers
   let_it_be(:admin) { create(:admin) }
 
   before do
@@ -30,7 +31,8 @@ RSpec.describe "Admin Health Check", feature_category: :continuous_verification
     describe 'reload access token' do
       it 'changes the access token' do
         orig_token = Gitlab::CurrentSettings.health_check_access_token
-        click_button 'Reset health check access token'
+        click_link 'Reset health check access token'
+        accept_gl_confirm('Are you sure you want to reset the health check token?')
 
         expect(page).to have_content('New health check access token has been generated!')
         expect(find('#health-check-token').text).not_to eq orig_token
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
index fc7833809b3..e1f1a63565c 100644
--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -201,6 +201,12 @@ RSpec.describe 'Branches', feature_category: :projects do
       end
     end
 
+    describe 'Link to branch rules' do
+      it 'does not have possibility to navigate to branch rules', :js do
+        expect(page).not_to have_content(s_("Branches|View branch rules"))
+      end
+    end
+
     context 'on project with 0 branch' do
       let(:project) { create(:project, :public, :empty_repo) }
       let(:repository) { project.repository }
@@ -239,6 +245,17 @@ RSpec.describe 'Branches', feature_category: :projects do
           expect(page).not_to have_content 'Merge request'
         end
       end
+
+      describe 'Navigate to branch rules from branches page' do
+        it 'shows repository settings page with Branch rules section expanded' do
+          visit project_branches_path(project)
+
+          view_branch_rules
+
+          expect(page).to have_content(
+            _('Define rules for who can push, merge, and the required approvals for each branch.'))
+        end
+      end
     end
   end
 
@@ -353,4 +370,11 @@ RSpec.describe 'Branches', feature_category: :projects do
       click_button 'Yes, delete branch'
     end
   end
+
+  def view_branch_rules
+    page.within('.nav-controls') do
+      click_link s_("Branches|View branch rules")
+    end
+    wait_for_requests
+  end
 end
diff --git a/spec/frontend/lib/utils/error_message_spec.js b/spec/frontend/lib/utils/error_message_spec.js
new file mode 100644
index 00000000000..17b5168c32f
--- /dev/null
+++ b/spec/frontend/lib/utils/error_message_spec.js
@@ -0,0 +1,65 @@
+import { parseErrorMessage, USER_FACING_ERROR_MESSAGE_PREFIX } from '~/lib/utils/error_message';
+
+const defaultErrorMessage = 'Something caused this error';
+const userFacingErrorMessage = 'User facing error message';
+const nonUserFacingErrorMessage = 'NonUser facing error message';
+const genericErrorMessage = 'Some error message';
+
+describe('error message', () => {
+  describe('when given an errormessage object', () => {
+    const errorMessageObject = {
+      options: {
+        cause: defaultErrorMessage,
+      },
+      filename: 'error.js',
+      linenumber: 7,
+    };
+
+    it('returns the correct values for userfacing errors', () => {
+      const userFacingObject = errorMessageObject;
+      userFacingObject.message = `${USER_FACING_ERROR_MESSAGE_PREFIX} ${userFacingErrorMessage}`;
+
+      expect(parseErrorMessage(userFacingObject)).toEqual({
+        message: userFacingErrorMessage,
+        userFacing: true,
+      });
+    });
+
+    it('returns the correct values for non userfacing errors', () => {
+      const nonUserFacingObject = errorMessageObject;
+      nonUserFacingObject.message = nonUserFacingErrorMessage;
+
+      expect(parseErrorMessage(nonUserFacingObject)).toEqual({
+        message: nonUserFacingErrorMessage,
+        userFacing: false,
+      });
+    });
+  });
+
+  describe('when given an errormessage string', () => {
+    it('returns the correct values for userfacing errors', () => {
+      expect(
+        parseErrorMessage(`${USER_FACING_ERROR_MESSAGE_PREFIX} ${genericErrorMessage}`),
+      ).toEqual({
+        message: genericErrorMessage,
+        userFacing: true,
+      });
+    });
+
+    it('returns the correct values for non userfacing errors', () => {
+      expect(parseErrorMessage(genericErrorMessage)).toEqual({
+        message: genericErrorMessage,
+        userFacing: false,
+      });
+    });
+  });
+
+  describe('when given nothing', () => {
+    it('returns an empty error message', () => {
+      expect(parseErrorMessage()).toEqual({
+        message: '',
+        userFacing: false,
+      });
+    });
+  });
+});
diff --git a/spec/frontend/security_configuration/components/app_spec.js b/spec/frontend/security_configuration/components/app_spec.js
index 5ef387adf39..0ca350f9ed7 100644
--- a/spec/frontend/security_configuration/components/app_spec.js
+++ b/spec/frontend/security_configuration/components/app_spec.js
@@ -26,6 +26,8 @@ import {
   REPORT_TYPE_LICENSE_COMPLIANCE,
   REPORT_TYPE_SAST,
 } from '~/vue_shared/security_reports/constants';
+import { USER_FACING_ERROR_MESSAGE_PREFIX } from '~/lib/utils/error_message';
+import { manageViaMRErrorMessage } from '../constants';
 
 const upgradePath = '/upgrade';
 const autoDevopsHelpPagePath = '/autoDevopsHelpPagePath';
@@ -200,18 +202,21 @@ describe('App component', () => {
       });
     });
 
-    describe('when error occurs', () => {
+    describe('when user facing error occurs', () => {
       it('should show Alert with error Message', async () => {
         expect(findManageViaMRErrorAlert().exists()).toBe(false);
-        findFeatureCards().at(1).vm.$emit('error', 'There was a manage via MR error');
+        // Prefixed with USER_FACING_ERROR_MESSAGE_PREFIX as used in lib/gitlab/utils/error_message.rb to indicate a user facing error
+        findFeatureCards()
+          .at(1)
+          .vm.$emit('error', `${USER_FACING_ERROR_MESSAGE_PREFIX} ${manageViaMRErrorMessage}`);
 
         await nextTick();
         expect(findManageViaMRErrorAlert().exists()).toBe(true);
-        expect(findManageViaMRErrorAlert().text()).toEqual('There was a manage via MR error');
+        expect(findManageViaMRErrorAlert().text()).toEqual(manageViaMRErrorMessage);
       });
 
       it('should hide Alert when it is dismissed', async () => {
-        findFeatureCards().at(1).vm.$emit('error', 'There was a manage via MR error');
+        findFeatureCards().at(1).vm.$emit('error', manageViaMRErrorMessage);
 
         await nextTick();
         expect(findManageViaMRErrorAlert().exists()).toBe(true);
@@ -221,6 +226,17 @@ describe('App component', () => {
         expect(findManageViaMRErrorAlert().exists()).toBe(false);
       });
     });
+
+    describe('when non-user facing error occurs', () => {
+      it('should show Alert with generic error Message', async () => {
+        expect(findManageViaMRErrorAlert().exists()).toBe(false);
+        findFeatureCards().at(1).vm.$emit('error', manageViaMRErrorMessage);
+
+        await nextTick();
+        expect(findManageViaMRErrorAlert().exists()).toBe(true);
+        expect(findManageViaMRErrorAlert().text()).toEqual(i18n.genericErrorText);
+      });
+    });
   });
 
   describe('Auto DevOps hint alert', () => {
diff --git a/spec/frontend/security_configuration/components/feature_card_spec.js b/spec/frontend/security_configuration/components/feature_card_spec.js
index 7c91c13c6d7..23edd8a69de 100644
--- a/spec/frontend/security_configuration/components/feature_card_spec.js
+++ b/spec/frontend/security_configuration/components/feature_card_spec.js
@@ -5,6 +5,7 @@ import FeatureCard from '~/security_configuration/components/feature_card.vue';
 import FeatureCardBadge from '~/security_configuration/components/feature_card_badge.vue';
 import ManageViaMr from '~/vue_shared/security_configuration/components/manage_via_mr.vue';
 import { REPORT_TYPE_SAST } from '~/vue_shared/security_reports/constants';
+import { manageViaMRErrorMessage } from '../constants';
 import { makeFeature } from './utils';
 
 describe('FeatureCard component', () => {
@@ -106,8 +107,8 @@ describe('FeatureCard component', () => {
     });
 
     it('should catch and emit manage-via-mr-error', () => {
-      findManageViaMr().vm.$emit('error', 'There was a manage via MR error');
-      expect(wrapper.emitted('error')).toEqual([['There was a manage via MR error']]);
+      findManageViaMr().vm.$emit('error', manageViaMRErrorMessage);
+      expect(wrapper.emitted('error')).toEqual([[manageViaMRErrorMessage]]);
     });
   });
 
diff --git a/spec/frontend/security_configuration/constants.js b/spec/frontend/security_configuration/constants.js
new file mode 100644
index 00000000000..d31036a2534
--- /dev/null
+++ b/spec/frontend/security_configuration/constants.js
@@ -0,0 +1 @@
+export const manageViaMRErrorMessage = 'There was a manage via MR error';
diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
index 7f26190830e..0bfca9a290b 100644
--- a/spec/graphql/types/project_type_spec.rb
+++ b/spec/graphql/types/project_type_spec.rb
@@ -291,7 +291,7 @@ RSpec.describe GitlabSchema.types['Project'] do
       let_it_be(:project) { create(:project_empty_repo) }
 
       it 'raises an error' do
-        expect(subject['errors'][0]['message']).to eq('You must <a target="_blank" rel="noopener noreferrer" ' \
+        expect(subject['errors'][0]['message']).to eq('UF: You must <a target="_blank" rel="noopener noreferrer" ' \
                                                       'href="http://localhost/help/user/project/repository/index.md#' \
                                                       'add-files-to-a-repository">add at least one file to the ' \
                                                       'repository</a> before using Security features.')
diff --git a/spec/lib/gitlab/utils/error_message_spec.rb b/spec/lib/gitlab/utils/error_message_spec.rb
new file mode 100644
index 00000000000..2c2d16656e8
--- /dev/null
+++ b/spec/lib/gitlab/utils/error_message_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+
+RSpec.describe Gitlab::Utils::ErrorMessage, feature_category: :error_tracking do
+  let(:klass) do
+    Class.new do
+      include Gitlab::Utils::ErrorMessage
+    end
+  end
+
+  subject(:object) { klass.new }
+
+  describe 'error message' do
+    subject { object.to_user_facing(string) }
+
+    let(:string) { 'Error Message' }
+
+    it "returns input prefixed with UF:" do
+      is_expected.to eq 'UF: Error Message'
+    end
+  end
+end
diff --git a/spec/support/shared_examples/services/security/ci_configuration/create_service_shared_examples.rb b/spec/support/shared_examples/services/security/ci_configuration/create_service_shared_examples.rb
index 8bfe57f4549..9fcdd296ebe 100644
--- a/spec/support/shared_examples/services/security/ci_configuration/create_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/security/ci_configuration/create_service_shared_examples.rb
@@ -168,7 +168,7 @@ RSpec.shared_examples_for 'services security ci configuration create service' do
         it 'returns an error' do
           expect { result }.to raise_error { |error|
             expect(error).to be_a(Gitlab::Graphql::Errors::MutationError)
-            expect(error.message).to eq('You must <a target="_blank" rel="noopener noreferrer" ' \
+            expect(error.message).to eq('UF: You must <a target="_blank" rel="noopener noreferrer" ' \
                                         'href="http://localhost/help/user/project/repository/index.md' \
                                         '#add-files-to-a-repository">add at least one file to the repository' \
                                         '</a> before using Security features.')