Add latest changes from gitlab-org/gitlab@master

3 files changed, 89 insertions, 9 deletions

diff --git a/spec/frontend/alert_management/components/alert_management_detail_spec.js b/spec/frontend/alert_management/components/alert_management_detail_spec.js
index af524619913..2758014aaa7 100644
--- a/spec/frontend/alert_management/components/alert_management_detail_spec.js
+++ b/spec/frontend/alert_management/components/alert_management_detail_spec.js
@@ -2,6 +2,10 @@ import { shallowMount } from '@vue/test-utils';
 import { GlAlert, GlLoadingIcon } from '@gitlab/ui';
 import AlertDetails from '~/alert_management/components/alert_details.vue';
 
+import mockAlerts from '../mocks/alerts.json';
+
+const mockAlert = mockAlerts[0];
+
 describe('AlertDetails', () => {
   let wrapper;
   const newIssuePath = 'root/alerts/-/issues/new';
@@ -56,7 +60,7 @@ describe('AlertDetails', () => {
 
     describe('when alert is present', () => {
       beforeEach(() => {
-        mountComponent();
+        mountComponent({ data: { alert: mockAlert } });
       });
 
       it('renders a tab with overview information', () => {
@@ -67,8 +71,39 @@ describe('AlertDetails', () => {
         expect(wrapper.find('[data-testid="fullDetailsTab"]').exists()).toBe(true);
       });
 
-      it('renders alert details', () => {
+      it('renders a title', () => {
+        expect(wrapper.find('[data-testid="title"]').text()).toBe(mockAlert.title);
+      });
+
+      it('renders a start time', () => {
         expect(wrapper.find('[data-testid="startTimeItem"]').exists()).toBe(true);
+        expect(wrapper.find('[data-testid="startTimeItem"]').props().time).toBe(
+          mockAlert.startedAt,
+        );
+      });
+    });
+
+    describe('individual alert fields', () => {
+      describe.each`
+        field               | data            | isShown
+        ${'eventCount'}     | ${1}            | ${true}
+        ${'eventCount'}     | ${undefined}    | ${false}
+        ${'monitoringTool'} | ${'New Relic'}  | ${true}
+        ${'monitoringTool'} | ${undefined}    | ${false}
+        ${'service'}        | ${'Prometheus'} | ${true}
+        ${'service'}        | ${undefined}    | ${false}
+      `(`$desc`, ({ field, data, isShown }) => {
+        beforeEach(() => {
+          mountComponent({ data: { alert: { ...mockAlert, [field]: data } } });
+        });
+
+        it(`${field} is ${isShown ? 'displayed' : 'hidden'} correctly`, () => {
+          if (isShown) {
+            expect(wrapper.find(`[data-testid="${field}"]`).text()).toBe(data.toString());
+          } else {
+            expect(wrapper.find(`[data-testid="${field}"]`).exists()).toBe(false);
+          }
+        });
       });
     });
 
diff --git a/spec/frontend/helpers/vue_mount_component_helper.js b/spec/frontend/helpers/vue_mount_component_helper.js
index 6848c95d95d..615ff69a01c 100644
--- a/spec/frontend/helpers/vue_mount_component_helper.js
+++ b/spec/frontend/helpers/vue_mount_component_helper.js
@@ -1,22 +1,38 @@
 import Vue from 'vue';
 
+/**
+ * Deprecated. Please do not use.
+ * Please see https://gitlab.com/groups/gitlab-org/-/epics/2445
+ */
 const mountComponent = (Component, props = {}, el = null) =>
   new Component({
     propsData: props,
   }).$mount(el);
 
+/**
+ * Deprecated. Please do not use.
+ * Please see https://gitlab.com/groups/gitlab-org/-/epics/2445
+ */
 export const createComponentWithStore = (Component, store, propsData = {}) =>
   new Component({
     store,
     propsData,
   });
 
+/**
+ * Deprecated. Please do not use.
+ * Please see https://gitlab.com/groups/gitlab-org/-/epics/2445
+ */
 export const mountComponentWithStore = (Component, { el, props, store }) =>
   new Component({
     store,
     propsData: props || {},
   }).$mount(el);
 
+/**
+ * Deprecated. Please do not use.
+ * Please see https://gitlab.com/groups/gitlab-org/-/epics/2445
+ */
 export const mountComponentWithSlots = (Component, { props, slots }) => {
   const component = new Component({
     propsData: props || {},
@@ -30,9 +46,18 @@ export const mountComponentWithSlots = (Component, { props, slots }) => {
 /**
  * Mount a component with the given render method.
  *
+ * -----------------------------
+ * Deprecated. Please do not use.
+ * Please see https://gitlab.com/groups/gitlab-org/-/epics/2445
+ * -----------------------------
+ *
  * This helps with inserting slots that need to be compiled.
  */
 export const mountComponentWithRender = (render, el = null) =>
   mountComponent(Vue.extend({ render }), {}, el);
 
+/**
+ * Deprecated. Please do not use.
+ * Please see https://gitlab.com/groups/gitlab-org/-/epics/2445
+ */
 export default mountComponent;
diff --git a/spec/frontend/snippets/components/snippet_header_spec.js b/spec/frontend/snippets/components/snippet_header_spec.js
index fb04959a7bf..9f6888fca11 100644
--- a/spec/frontend/snippets/components/snippet_header_spec.js
+++ b/spec/frontend/snippets/components/snippet_header_spec.js
@@ -172,14 +172,34 @@ describe('Snippet header component', () => {
       });
     });
 
-    it('closes modal and redirects to snippets listing in case of successful mutation', () => {
-      createComponent();
-      wrapper.vm.closeDeleteModal = jest.fn();
+    describe('in case of successful mutation, closes modal and redirects to correct listing', () => {
+      const createDeleteSnippet = (snippetProps = {}) => {
+        createComponent({
+          snippetProps,
+        });
+        wrapper.vm.closeDeleteModal = jest.fn();
+
+        wrapper.vm.deleteSnippet();
+        return wrapper.vm.$nextTick();
+      };
 
-      wrapper.vm.deleteSnippet();
-      return wrapper.vm.$nextTick().then(() => {
-        expect(wrapper.vm.closeDeleteModal).toHaveBeenCalled();
-        expect(window.location.pathname).toEqual('dashboard/snippets');
+      it('redirects to dashboard/snippets for personal snippet', () => {
+        return createDeleteSnippet().then(() => {
+          expect(wrapper.vm.closeDeleteModal).toHaveBeenCalled();
+          expect(window.location.pathname).toBe('dashboard/snippets');
+        });
+      });
+
+      it('redirects to project snippets for project snippet', () => {
+        const fullPath = 'foo/bar';
+        return createDeleteSnippet({
+          project: {
+            fullPath,
+          },
+        }).then(() => {
+          expect(wrapper.vm.closeDeleteModal).toHaveBeenCalled();
+          expect(window.location.pathname).toBe(fullPath);
+        });
       });
     });
   });