Add latest changes from gitlab-org/gitlab@master

2 files changed, 131 insertions, 1 deletions

diff --git a/spec/frontend/security_configuration/components/auto_dev_ops_enabled_alert_spec.js b/spec/frontend/security_configuration/components/auto_dev_ops_enabled_alert_spec.js
new file mode 100644
index 00000000000..778fea2896a
--- /dev/null
+++ b/spec/frontend/security_configuration/components/auto_dev_ops_enabled_alert_spec.js
@@ -0,0 +1,46 @@
+import { GlAlert } from '@gitlab/ui';
+import { mount } from '@vue/test-utils';
+import AutoDevopsEnabledAlert from '~/security_configuration/components/auto_dev_ops_enabled_alert.vue';
+
+const autoDevopsHelpPagePath = '/autoDevopsHelpPagePath';
+
+describe('AutoDevopsEnabledAlert component', () => {
+  let wrapper;
+
+  const createComponent = () => {
+    wrapper = mount(AutoDevopsEnabledAlert, {
+      provide: {
+        autoDevopsHelpPagePath,
+      },
+    });
+  };
+
+  const findAlert = () => wrapper.findComponent(GlAlert);
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('contains correct body text', () => {
+    expect(wrapper.text()).toMatchInterpolatedText(AutoDevopsEnabledAlert.i18n.body);
+  });
+
+  it('renders the link correctly', () => {
+    const link = wrapper.find('a[href]');
+
+    expect(link.attributes('href')).toBe(autoDevopsHelpPagePath);
+    expect(link.text()).toBe('Auto DevOps');
+  });
+
+  it('bubbles up dismiss events from the GlAlert', () => {
+    expect(wrapper.emitted('dismiss')).toBe(undefined);
+
+    findAlert().vm.$emit('dismiss');
+
+    expect(wrapper.emitted('dismiss')).toEqual([[]]);
+  });
+});
diff --git a/spec/frontend/security_configuration/components/redesigned_app_spec.js b/spec/frontend/security_configuration/components/redesigned_app_spec.js
index 119a25a77c1..92e0443552c 100644
--- a/spec/frontend/security_configuration/components/redesigned_app_spec.js
+++ b/spec/frontend/security_configuration/components/redesigned_app_spec.js
@@ -1,8 +1,11 @@
 import { GlTab } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
+import { useLocalStorageSpy } from 'helpers/local_storage_helper';
 import { makeMockUserCalloutDismisser } from 'helpers/mock_user_callout_dismisser';
+import stubChildren from 'helpers/stub_children';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import AutoDevopsAlert from '~/security_configuration/components/auto_dev_ops_alert.vue';
+import AutoDevopsEnabledAlert from '~/security_configuration/components/auto_dev_ops_enabled_alert.vue';
 import {
   SAST_NAME,
   SAST_SHORT_NAME,
@@ -12,6 +15,7 @@ import {
   LICENSE_COMPLIANCE_NAME,
   LICENSE_COMPLIANCE_DESCRIPTION,
   LICENSE_COMPLIANCE_HELP_PATH,
+  AUTO_DEVOPS_ENABLED_ALERT_DISMISSED_STORAGE_KEY,
 } from '~/security_configuration/components/constants';
 import FeatureCard from '~/security_configuration/components/feature_card.vue';
 
@@ -28,6 +32,9 @@ const upgradePath = '/upgrade';
 const autoDevopsHelpPagePath = '/autoDevopsHelpPagePath';
 const autoDevopsPath = '/autoDevopsPath';
 const gitlabCiHistoryPath = 'test/historyPath';
+const projectPath = 'namespace/project';
+
+useLocalStorageSpy();
 
 describe('redesigned App component', () => {
   let wrapper;
@@ -43,8 +50,14 @@ describe('redesigned App component', () => {
           upgradePath,
           autoDevopsHelpPagePath,
           autoDevopsPath,
+          projectPath,
         },
         stubs: {
+          ...stubChildren(RedesignedSecurityConfigurationApp),
+          GlLink: false,
+          GlSprintf: false,
+          LocalStorageSync: false,
+          SectionLayout: false,
           UserCalloutDismisser: makeMockUserCalloutDismisser({
             dismiss: userCalloutDismissSpy,
             shouldShowCallout,
@@ -83,6 +96,7 @@ describe('redesigned App component', () => {
     });
   const findUpgradeBanner = () => wrapper.findComponent(UpgradeBanner);
   const findAutoDevopsAlert = () => wrapper.findComponent(AutoDevopsAlert);
+  const findAutoDevopsEnabledAlert = () => wrapper.findComponent(AutoDevopsEnabledAlert);
 
   const securityFeaturesMock = [
     {
@@ -161,7 +175,7 @@ describe('redesigned App component', () => {
     });
   });
 
-  describe('autoDevOpsAlert', () => {
+  describe('Auto DevOps hint alert', () => {
     describe('given the right props', () => {
       beforeEach(() => {
         createComponent({
@@ -199,6 +213,76 @@ describe('redesigned App component', () => {
     });
   });
 
+  describe('Auto DevOps enabled alert', () => {
+    describe.each`
+      context                                        | autoDevopsEnabled | localStorageValue | shouldRender
+      ${'enabled'}                                   | ${true}           | ${null}           | ${true}
+      ${'enabled, alert dismissed on other project'} | ${true}           | ${['foo/bar']}    | ${true}
+      ${'enabled, alert dismissed on this project'}  | ${true}           | ${[projectPath]}  | ${false}
+      ${'not enabled'}                               | ${false}          | ${null}           | ${false}
+    `('given Auto DevOps is $context', ({ autoDevopsEnabled, localStorageValue, shouldRender }) => {
+      beforeEach(() => {
+        if (localStorageValue !== null) {
+          window.localStorage.setItem(
+            AUTO_DEVOPS_ENABLED_ALERT_DISMISSED_STORAGE_KEY,
+            JSON.stringify(localStorageValue),
+          );
+        }
+
+        createComponent({
+          augmentedSecurityFeatures: securityFeaturesMock,
+          augmentedComplianceFeatures: complianceFeaturesMock,
+          autoDevopsEnabled,
+        });
+      });
+
+      it(shouldRender ? 'renders' : 'does not render', () => {
+        expect(findAutoDevopsEnabledAlert().exists()).toBe(shouldRender);
+      });
+    });
+
+    describe('dismissing', () => {
+      describe.each`
+        dismissedProjects | expectedWrittenValue
+        ${null}           | ${[projectPath]}
+        ${[]}             | ${[projectPath]}
+        ${['foo/bar']}    | ${['foo/bar', projectPath]}
+        ${[projectPath]}  | ${[projectPath]}
+      `(
+        'given dismissed projects $dismissedProjects',
+        ({ dismissedProjects, expectedWrittenValue }) => {
+          beforeEach(() => {
+            if (dismissedProjects !== null) {
+              window.localStorage.setItem(
+                AUTO_DEVOPS_ENABLED_ALERT_DISMISSED_STORAGE_KEY,
+                JSON.stringify(dismissedProjects),
+              );
+            }
+
+            createComponent({
+              augmentedSecurityFeatures: securityFeaturesMock,
+              augmentedComplianceFeatures: complianceFeaturesMock,
+              autoDevopsEnabled: true,
+            });
+
+            findAutoDevopsEnabledAlert().vm.$emit('dismiss');
+          });
+
+          it('adds current project to localStorage value', () => {
+            expect(window.localStorage.setItem).toHaveBeenLastCalledWith(
+              AUTO_DEVOPS_ENABLED_ALERT_DISMISSED_STORAGE_KEY,
+              JSON.stringify(expectedWrittenValue),
+            );
+          });
+
+          it('hides the alert', () => {
+            expect(findAutoDevopsEnabledAlert().exists()).toBe(false);
+          });
+        },
+      );
+    });
+  });
+
   describe('upgrade banner', () => {
     const makeAvailable = (available) => (feature) => ({ ...feature, available });