Add latest changes from gitlab-org/gitlab@master

9 files changed, 210 insertions, 21 deletions

diff --git a/spec/frontend/blob/blob_file_dropzone_spec.js b/spec/frontend/blob/blob_file_dropzone_spec.js
index cbd36abd4ff..95520577e9a 100644
--- a/spec/frontend/blob/blob_file_dropzone_spec.js
+++ b/spec/frontend/blob/blob_file_dropzone_spec.js
@@ -1,5 +1,10 @@
 import $ from 'jquery';
 import BlobFileDropzone from '~/blob/blob_file_dropzone';
+import { trackUploadFileFormSubmitted } from '~/projects/upload_file_experiment';
+
+jest.mock('~/projects/upload_file_experiment', () => ({
+  trackUploadFileFormSubmitted: jest.fn(),
+}));
 
 describe('BlobFileDropzone', () => {
   preloadFixtures('blob/show.html');
@@ -41,5 +46,13 @@ describe('BlobFileDropzone', () => {
       expect(replaceFileButton.is(':disabled')).toEqual(true);
       expect(dropzone.processQueue).toHaveBeenCalled();
     });
+
+    it('calls the tracking event', () => {
+      jest.spyOn(window, 'alert').mockImplementation(() => {});
+
+      replaceFileButton.click();
+
+      expect(trackUploadFileFormSubmitted).toHaveBeenCalled();
+    });
   });
 });
diff --git a/spec/frontend/commit/pipelines/pipelines_spec.js b/spec/frontend/commit/pipelines/pipelines_spec.js
index f8bdd00f5da..8c442a0376e 100644
--- a/spec/frontend/commit/pipelines/pipelines_spec.js
+++ b/spec/frontend/commit/pipelines/pipelines_spec.js
@@ -16,7 +16,6 @@ describe('Pipelines table in Commits and Merge requests', () => {
     helpPagePath: 'foo',
     emptyStateSvgPath: 'foo',
     errorStateSvgPath: 'foo',
-    autoDevopsHelpPath: 'foo',
   };
 
   preloadFixtures(jsonFixtureName);
diff --git a/spec/frontend/experiment_tracking_spec.js b/spec/frontend/experiment_tracking_spec.js
new file mode 100644
index 00000000000..ac05419cecd
--- /dev/null
+++ b/spec/frontend/experiment_tracking_spec.js
@@ -0,0 +1,77 @@
+import ExperimentTracking from '~/experiment_tracking';
+import Tracking from '~/tracking';
+
+jest.mock('~/tracking');
+
+const oldGon = window.gon;
+
+let experimentTracking;
+let label;
+let newGon = {};
+
+const setup = () => {
+  window.gon = newGon;
+  experimentTracking = new ExperimentTracking('sidebar_experiment', label);
+};
+
+beforeEach(() => {
+  document.body.dataset.page = 'issues-page';
+});
+
+afterEach(() => {
+  window.gon = oldGon;
+  Tracking.mockClear();
+  label = undefined;
+});
+
+describe('event', () => {
+  describe('when experiment data exists for experimentName', () => {
+    beforeEach(() => {
+      newGon = { global: { experiment: { sidebar_experiment: 'experiment-data' } } };
+      setup();
+    });
+
+    describe('when providing options', () => {
+      label = { label: 'sidebar-drawer' };
+
+      it('passes them to the tracking call', () => {
+        experimentTracking.event('click_sidebar_close');
+
+        expect(Tracking.event).toHaveBeenCalledTimes(1);
+        expect(Tracking.event).toHaveBeenCalledWith('issues-page', 'click_sidebar_close', {
+          label: 'sidebar-drawer',
+          context: {
+            schema: 'iglu:com.gitlab/gitlab_experiment/jsonschema/1-0-0',
+            data: 'experiment-data',
+          },
+        });
+      });
+    });
+
+    it('tracks with the correct context', () => {
+      experimentTracking.event('click_sidebar_trigger');
+
+      expect(Tracking.event).toHaveBeenCalledTimes(1);
+      expect(Tracking.event).toHaveBeenCalledWith('issues-page', 'click_sidebar_trigger', {
+        label: undefined,
+        context: {
+          schema: 'iglu:com.gitlab/gitlab_experiment/jsonschema/1-0-0',
+          data: 'experiment-data',
+        },
+      });
+    });
+  });
+
+  describe('when experiment data does NOT exists for the experimentName', () => {
+    beforeEach(() => {
+      newGon = { global: { experiment: { unrelated_experiment: 'not happening' } } };
+      setup();
+    });
+
+    it('does not track', () => {
+      experimentTracking.event('click_sidebar_close');
+
+      expect(Tracking.event).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js b/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js
index c6e7ee44355..6a8ab02a69a 100644
--- a/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js
+++ b/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js
@@ -30,14 +30,21 @@ describe('JiraTriggerFields', () => {
   const findCommentSettings = () => wrapper.find('[data-testid="comment-settings"]');
   const findCommentDetail = () => wrapper.find('[data-testid="comment-detail"]');
   const findCommentSettingsCheckbox = () => findCommentSettings().find(GlFormCheckbox);
+  const findIssueTransitionSettings = () =>
+    wrapper.find('[data-testid="issue-transition-settings"]');
+  const findIssueTransitionModeRadios = () =>
+    findIssueTransitionSettings().findAll('input[type="radio"]');
+  const findIssueTransitionIdsField = () =>
+    wrapper.find('input[type="text"][name="service[jira_issue_transition_id]"]');
 
   describe('template', () => {
     describe('initialTriggerCommit and initialTriggerMergeRequest are false', () => {
-      it('does not show comment settings', () => {
+      it('does not show trigger settings', () => {
         createComponent();
 
         expect(findCommentSettings().isVisible()).toBe(false);
         expect(findCommentDetail().isVisible()).toBe(false);
+        expect(findIssueTransitionSettings().isVisible()).toBe(false);
       });
     });
 
@@ -48,9 +55,10 @@ describe('JiraTriggerFields', () => {
         });
       });
 
-      it('shows comment settings', () => {
+      it('shows trigger settings', () => {
         expect(findCommentSettings().isVisible()).toBe(true);
         expect(findCommentDetail().isVisible()).toBe(false);
+        expect(findIssueTransitionSettings().isVisible()).toBe(true);
       });
 
       // As per https://vuejs.org/v2/guide/forms.html#Checkbox-1,
@@ -73,13 +81,14 @@ describe('JiraTriggerFields', () => {
     });
 
     describe('initialTriggerMergeRequest is true', () => {
-      it('shows comment settings', () => {
+      it('shows trigger settings', () => {
         createComponent({
           initialTriggerMergeRequest: true,
         });
 
         expect(findCommentSettings().isVisible()).toBe(true);
         expect(findCommentDetail().isVisible()).toBe(false);
+        expect(findIssueTransitionSettings().isVisible()).toBe(true);
       });
     });
 
@@ -95,7 +104,41 @@ describe('JiraTriggerFields', () => {
       });
     });
 
-    it('disables checkboxes and radios if inheriting', () => {
+    describe('initialJiraIssueTransitionId is not set', () => {
+      it('uses automatic transitions', () => {
+        createComponent({
+          initialTriggerCommit: true,
+        });
+
+        const [radio1, radio2] = findIssueTransitionModeRadios().wrappers;
+        expect(radio1.element.checked).toBe(true);
+        expect(radio2.element.checked).toBe(false);
+
+        expect(findIssueTransitionIdsField().exists()).toBe(false);
+      });
+    });
+
+    describe('initialJiraIssueTransitionId is set', () => {
+      it('uses custom transitions', () => {
+        createComponent({
+          initialJiraIssueTransitionId: '1, 2, 3',
+          initialTriggerCommit: true,
+        });
+
+        const [radio1, radio2] = findIssueTransitionModeRadios().wrappers;
+        expect(radio1.element.checked).toBe(false);
+        expect(radio2.element.checked).toBe(true);
+
+        const field = findIssueTransitionIdsField();
+        expect(field.isVisible()).toBe(true);
+        expect(field.element).toMatchObject({
+          type: 'text',
+          value: '1, 2, 3',
+        });
+      });
+    });
+
+    it('disables input fields if inheriting', () => {
       createComponent(
         {
           initialTriggerCommit: true,
@@ -104,12 +147,8 @@ describe('JiraTriggerFields', () => {
         true,
       );
 
-      wrapper.findAll('[type=checkbox]').wrappers.forEach((checkbox) => {
-        expect(checkbox.attributes('disabled')).toBe('disabled');
-      });
-
-      wrapper.findAll('[type=radio]').wrappers.forEach((radio) => {
-        expect(radio.attributes('disabled')).toBe('disabled');
+      wrapper.findAll('[type=text], [type=checkbox], [type=radio]').wrappers.forEach((input) => {
+        expect(input.attributes('disabled')).toBe('disabled');
       });
     });
   });
diff --git a/spec/frontend/pipelines/pipeline_url_spec.js b/spec/frontend/pipelines/pipeline_url_spec.js
index 44c9def99cc..4997e9cf3ec 100644
--- a/spec/frontend/pipelines/pipeline_url_spec.js
+++ b/spec/frontend/pipelines/pipeline_url_spec.js
@@ -1,9 +1,8 @@
 import { shallowMount } from '@vue/test-utils';
-import $ from 'jquery';
 import { trimText } from 'helpers/text_helper';
 import PipelineUrlComponent from '~/pipelines/components/pipelines_list/pipeline_url.vue';
 
-$.fn.popover = () => {};
+const projectPath = 'test/test';
 
 describe('Pipeline Url Component', () => {
   let wrapper;
@@ -14,6 +13,7 @@ describe('Pipeline Url Component', () => {
   const findYamlTag = () => wrapper.find('[data-testid="pipeline-url-yaml"]');
   const findFailureTag = () => wrapper.find('[data-testid="pipeline-url-failure"]');
   const findAutoDevopsTag = () => wrapper.find('[data-testid="pipeline-url-autodevops"]');
+  const findAutoDevopsTagLink = () => wrapper.find('[data-testid="pipeline-url-autodevops-link"]');
   const findStuckTag = () => wrapper.find('[data-testid="pipeline-url-stuck"]');
   const findDetachedTag = () => wrapper.find('[data-testid="pipeline-url-detached"]');
   const findForkTag = () => wrapper.find('[data-testid="pipeline-url-fork"]');
@@ -23,9 +23,9 @@ describe('Pipeline Url Component', () => {
     pipeline: {
       id: 1,
       path: 'foo',
+      project: { full_path: `/${projectPath}` },
       flags: {},
     },
-    autoDevopsHelpPath: 'foo',
     pipelineScheduleUrl: 'foo',
   };
 
@@ -33,7 +33,7 @@ describe('Pipeline Url Component', () => {
     wrapper = shallowMount(PipelineUrlComponent, {
       propsData: { ...defaultProps, ...props },
       provide: {
-        targetProjectFullPath: 'test/test',
+        targetProjectFullPath: projectPath,
       },
     });
   };
@@ -57,6 +57,19 @@ describe('Pipeline Url Component', () => {
     expect(findPipelineUrlLink().text()).toBe('#1');
   });
 
+  it('should not render tags when flags are not set', () => {
+    createComponent();
+
+    expect(findStuckTag().exists()).toBe(false);
+    expect(findLatestTag().exists()).toBe(false);
+    expect(findYamlTag().exists()).toBe(false);
+    expect(findAutoDevopsTag().exists()).toBe(false);
+    expect(findFailureTag().exists()).toBe(false);
+    expect(findScheduledTag().exists()).toBe(false);
+    expect(findForkTag().exists()).toBe(false);
+    expect(findTrainTag().exists()).toBe(false);
+  });
+
   it('should render the stuck tag when flag is provided', () => {
     createComponent({
       pipeline: {
@@ -96,6 +109,7 @@ describe('Pipeline Url Component', () => {
   it('should render an autodevops badge when flag is provided', () => {
     createComponent({
       pipeline: {
+        ...defaultProps.pipeline,
         flags: {
           auto_devops: true,
         },
@@ -103,6 +117,11 @@ describe('Pipeline Url Component', () => {
     });
 
     expect(trimText(findAutoDevopsTag().text())).toBe('Auto DevOps');
+
+    expect(findAutoDevopsTagLink().attributes()).toMatchObject({
+      href: '/help/topics/autodevops/index.md',
+      target: '_blank',
+    });
   });
 
   it('should render a detached badge when flag is provided', () => {
@@ -147,7 +166,7 @@ describe('Pipeline Url Component', () => {
     createComponent({
       pipeline: {
         flags: {},
-        project: { fullPath: 'test/forked' },
+        project: { fullPath: '/test/forked' },
       },
     });
 
diff --git a/spec/frontend/pipelines/pipelines_spec.js b/spec/frontend/pipelines/pipelines_spec.js
index 811303a5624..663bd3f6174 100644
--- a/spec/frontend/pipelines/pipelines_spec.js
+++ b/spec/frontend/pipelines/pipelines_spec.js
@@ -34,7 +34,6 @@ describe('Pipelines', () => {
   let origWindowLocation;
 
   const paths = {
-    autoDevopsHelpPath: '/help/topics/autodevops/index.md',
     helpPagePath: '/help/ci/quick_start/README',
     emptyStateSvgPath: '/assets/illustrations/pipelines_empty.svg',
     errorStateSvgPath: '/assets/illustrations/pipelines_failed.svg',
@@ -45,7 +44,6 @@ describe('Pipelines', () => {
   };
 
   const noPermissions = {
-    autoDevopsHelpPath: '/help/topics/autodevops/index.md',
     helpPagePath: '/help/ci/quick_start/README',
     emptyStateSvgPath: '/assets/illustrations/pipelines_empty.svg',
     errorStateSvgPath: '/assets/illustrations/pipelines_failed.svg',
diff --git a/spec/frontend/pipelines/pipelines_table_row_spec.js b/spec/frontend/pipelines/pipelines_table_row_spec.js
index 660651547fc..60318511be2 100644
--- a/spec/frontend/pipelines/pipelines_table_row_spec.js
+++ b/spec/frontend/pipelines/pipelines_table_row_spec.js
@@ -9,7 +9,6 @@ describe('Pipelines Table Row', () => {
     mount(PipelinesTableRowComponent, {
       propsData: {
         pipeline,
-        autoDevopsHelpPath: 'foo',
         viewType: 'root',
       },
     });
diff --git a/spec/frontend/pipelines/pipelines_table_spec.js b/spec/frontend/pipelines/pipelines_table_spec.js
index fd73d507919..64febd7311c 100644
--- a/spec/frontend/pipelines/pipelines_table_spec.js
+++ b/spec/frontend/pipelines/pipelines_table_spec.js
@@ -9,7 +9,6 @@ describe('Pipelines Table', () => {
 
   const defaultProps = {
     pipelines: [],
-    autoDevopsHelpPath: 'foo',
     viewType: 'root',
   };
 
@@ -58,7 +57,7 @@ describe('Pipelines Table', () => {
 
   describe('with data', () => {
     it('should render rows', () => {
-      createComponent({ pipelines: [pipeline], autoDevopsHelpPath: 'foo', viewType: 'root' });
+      createComponent({ pipelines: [pipeline], viewType: 'root' });
 
       expect(findRows()).toHaveLength(1);
     });
diff --git a/spec/frontend/projects/upload_file_experiment_spec.js b/spec/frontend/projects/upload_file_experiment_spec.js
new file mode 100644
index 00000000000..57abce779a5
--- /dev/null
+++ b/spec/frontend/projects/upload_file_experiment_spec.js
@@ -0,0 +1,46 @@
+import ExperimentTracking from '~/experiment_tracking';
+import * as UploadFileExperiment from '~/projects/upload_file_experiment';
+
+const mockExperimentTrackingEvent = jest.fn();
+jest.mock('~/experiment_tracking', () =>
+  jest.fn().mockImplementation(() => ({
+    event: mockExperimentTrackingEvent,
+  })),
+);
+
+const fixture = `<a class='js-upload-file-experiment-trigger' data-toggle='modal' data-target='#modal-upload-blob'></a><div id='modal-upload-blob'></div>`;
+const findModal = () => document.querySelector('[aria-modal="true"]');
+const findTrigger = () => document.querySelector('.js-upload-file-experiment-trigger');
+
+beforeEach(() => {
+  ExperimentTracking.mockClear();
+  mockExperimentTrackingEvent.mockClear();
+
+  document.body.innerHTML = fixture;
+});
+
+afterEach(() => {
+  document.body.innerHTML = '';
+});
+
+describe('trackUploadFileFormSubmitted', () => {
+  it('initializes ExperimentTracking with the correct arguments and calls the tracking event with correct arguments', () => {
+    UploadFileExperiment.trackUploadFileFormSubmitted();
+
+    expect(ExperimentTracking).toHaveBeenCalledWith('empty_repo_upload', {
+      label: 'blob-upload-modal',
+    });
+    expect(mockExperimentTrackingEvent).toHaveBeenCalledWith('click_upload_modal_form_submit');
+  });
+});
+
+describe('initUploadFileTrigger', () => {
+  it('calls modal and tracks event', () => {
+    UploadFileExperiment.initUploadFileTrigger();
+
+    expect(findModal()).not.toExist();
+    findTrigger().click();
+    expect(findModal()).toExist();
+    expect(mockExperimentTrackingEvent).toHaveBeenCalledWith('click_upload_modal_trigger');
+  });
+});