Add latest changes from gitlab-org/gitlab@master

4 files changed, 277 insertions, 43 deletions

diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js
index e695fd8238d..a2c7f0b3767 100644
--- a/spec/frontend/notes/components/comment_form_spec.js
+++ b/spec/frontend/notes/components/comment_form_spec.js
@@ -24,7 +24,6 @@ describe('issue_comment_form component', () => {
   let store;
   let wrapper;
   let axiosMock;
-  let features = {};
 
   const setupStore = (userData, noteableData) => {
     store.dispatch('setUserData', userData);
@@ -38,16 +37,12 @@ describe('issue_comment_form component', () => {
         noteableType,
       },
       store,
-      provide: {
-        glFeatures: features,
-      },
     });
   };
 
   beforeEach(() => {
     axiosMock = new MockAdapter(axios);
     store = createStore();
-    features = {};
   });
 
   afterEach(() => {
@@ -303,32 +298,6 @@ describe('issue_comment_form component', () => {
           });
         });
       });
-
-      describe('when note can be confidential', () => {
-        it('appends confidential status to note payload when saving', () => {
-          jest.spyOn(wrapper.vm, 'saveNote').mockReturnValue(new Promise(() => {}));
-
-          wrapper.vm.note = 'confidential note';
-
-          return wrapper.vm.$nextTick().then(() => {
-            wrapper.find('.js-comment-submit-button').trigger('click');
-
-            const [providedData] = wrapper.vm.saveNote.mock.calls[0];
-
-            expect(providedData.data.note.confidential).toBe(false);
-          });
-        });
-
-        it('should render confidential toggle as false', () => {
-          features = { confidentialNotes: true };
-          mountComponent();
-
-          const input = wrapper.find('.js-confidential-note-toggle .form-check-input');
-
-          expect(input.exists()).toBe(true);
-          expect(input.attributes('checked')).toBeFalsy();
-        });
-      });
     });
 
     describe('issue is confidential', () => {
diff --git a/spec/frontend/notes/components/note_header_spec.js b/spec/frontend/notes/components/note_header_spec.js
index 19400e61b9c..8cb78720c7e 100644
--- a/spec/frontend/notes/components/note_header_spec.js
+++ b/spec/frontend/notes/components/note_header_spec.js
@@ -19,7 +19,6 @@ describe('NoteHeader component', () => {
   const findActionText = () => wrapper.find({ ref: 'actionText' });
   const findTimestampLink = () => wrapper.find({ ref: 'noteTimestampLink' });
   const findTimestamp = () => wrapper.find({ ref: 'noteTimestamp' });
-  const findConfidentialIndicator = () => wrapper.find({ ref: 'confidentialIndicator' });
   const findSpinner = () => wrapper.find({ ref: 'spinner' });
 
   const author = {
@@ -247,15 +246,4 @@ describe('NoteHeader component', () => {
       });
     });
   });
-
-  describe('with confidentiality indicator', () => {
-    it.each`
-      status   | condition
-      ${true}  | ${'shows'}
-      ${false} | ${'hides'}
-    `('$condition icon indicator when isConfidential is $status', ({ status }) => {
-      createComponent({ isConfidential: status });
-      expect(findConfidentialIndicator().exists()).toBe(status);
-    });
-  });
 });
diff --git a/spec/frontend/vue_mr_widget/stores/artifacts_list/actions_spec.js b/spec/frontend/vue_mr_widget/stores/artifacts_list/actions_spec.js
new file mode 100644
index 00000000000..026ea0e4d0a
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/stores/artifacts_list/actions_spec.js
@@ -0,0 +1,165 @@
+import MockAdapter from 'axios-mock-adapter';
+import testAction from 'helpers/vuex_action_helper';
+import { TEST_HOST } from 'helpers/test_constants';
+import axios from '~/lib/utils/axios_utils';
+import {
+  setEndpoint,
+  requestArtifacts,
+  clearEtagPoll,
+  stopPolling,
+  fetchArtifacts,
+  receiveArtifactsSuccess,
+  receiveArtifactsError,
+} from '~/vue_merge_request_widget/stores/artifacts_list/actions';
+import state from '~/vue_merge_request_widget/stores/artifacts_list/state';
+import * as types from '~/vue_merge_request_widget/stores/artifacts_list/mutation_types';
+
+describe('Artifacts App Store Actions', () => {
+  let mockedState;
+
+  beforeEach(() => {
+    mockedState = state();
+  });
+
+  describe('setEndpoint', () => {
+    it('should commit SET_ENDPOINT mutation', done => {
+      testAction(
+        setEndpoint,
+        'endpoint.json',
+        mockedState,
+        [{ type: types.SET_ENDPOINT, payload: 'endpoint.json' }],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('requestArtifacts', () => {
+    it('should commit REQUEST_ARTIFACTS mutation', done => {
+      testAction(
+        requestArtifacts,
+        null,
+        mockedState,
+        [{ type: types.REQUEST_ARTIFACTS }],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('fetchArtifacts', () => {
+    let mock;
+
+    beforeEach(() => {
+      mockedState.endpoint = `${TEST_HOST}/endpoint.json`;
+      mock = new MockAdapter(axios);
+    });
+
+    afterEach(() => {
+      mock.restore();
+      stopPolling();
+      clearEtagPoll();
+    });
+
+    describe('success', () => {
+      it('dispatches requestArtifacts and receiveArtifactsSuccess ', done => {
+        mock.onGet(`${TEST_HOST}/endpoint.json`).replyOnce(200, [
+          {
+            text: 'result.txt',
+            url: 'asda',
+            job_name: 'generate-artifact',
+            job_path: 'asda',
+          },
+        ]);
+
+        testAction(
+          fetchArtifacts,
+          null,
+          mockedState,
+          [],
+          [
+            {
+              type: 'requestArtifacts',
+            },
+            {
+              payload: {
+                data: [
+                  {
+                    text: 'result.txt',
+                    url: 'asda',
+                    job_name: 'generate-artifact',
+                    job_path: 'asda',
+                  },
+                ],
+                status: 200,
+              },
+              type: 'receiveArtifactsSuccess',
+            },
+          ],
+          done,
+        );
+      });
+    });
+
+    describe('error', () => {
+      beforeEach(() => {
+        mock.onGet(`${TEST_HOST}/endpoint.json`).reply(500);
+      });
+
+      it('dispatches requestArtifacts and receiveArtifactsError ', done => {
+        testAction(
+          fetchArtifacts,
+          null,
+          mockedState,
+          [],
+          [
+            {
+              type: 'requestArtifacts',
+            },
+            {
+              type: 'receiveArtifactsError',
+            },
+          ],
+          done,
+        );
+      });
+    });
+  });
+
+  describe('receiveArtifactsSuccess', () => {
+    it('should commit RECEIVE_ARTIFACTS_SUCCESS mutation with 200', done => {
+      testAction(
+        receiveArtifactsSuccess,
+        { data: { summary: {} }, status: 200 },
+        mockedState,
+        [{ type: types.RECEIVE_ARTIFACTS_SUCCESS, payload: { summary: {} } }],
+        [],
+        done,
+      );
+    });
+
+    it('should not commit RECEIVE_ARTIFACTS_SUCCESS mutation with 204', done => {
+      testAction(
+        receiveArtifactsSuccess,
+        { data: { summary: {} }, status: 204 },
+        mockedState,
+        [],
+        [],
+        done,
+      );
+    });
+  });
+
+  describe('receiveArtifactsError', () => {
+    it('should commit RECEIVE_ARTIFACTS_ERROR mutation', done => {
+      testAction(
+        receiveArtifactsError,
+        null,
+        mockedState,
+        [{ type: types.RECEIVE_ARTIFACTS_ERROR }],
+        [],
+        done,
+      );
+    });
+  });
+});
diff --git a/spec/frontend/vue_mr_widget/stores/mr_widget_store_spec.js b/spec/frontend/vue_mr_widget/stores/mr_widget_store_spec.js
new file mode 100644
index 00000000000..48326eda404
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/stores/mr_widget_store_spec.js
@@ -0,0 +1,112 @@
+import MergeRequestStore from '~/vue_merge_request_widget/stores/mr_widget_store';
+import { stateKey } from '~/vue_merge_request_widget/stores/state_maps';
+import mockData from '../mock_data';
+
+describe('MergeRequestStore', () => {
+  let store;
+
+  beforeEach(() => {
+    store = new MergeRequestStore(mockData);
+  });
+
+  describe('setData', () => {
+    it('should set isSHAMismatch when the diff SHA changes', () => {
+      store.setData({ ...mockData, diff_head_sha: 'a-different-string' });
+
+      expect(store.isSHAMismatch).toBe(true);
+    });
+
+    it('should not set isSHAMismatch when other data changes', () => {
+      store.setData({ ...mockData, work_in_progress: !mockData.work_in_progress });
+
+      expect(store.isSHAMismatch).toBe(false);
+    });
+
+    it('should update cached sha after rebasing', () => {
+      store.setData({ ...mockData, diff_head_sha: 'abc123' }, true);
+
+      expect(store.isSHAMismatch).toBe(false);
+      expect(store.sha).toBe('abc123');
+    });
+
+    describe('isPipelinePassing', () => {
+      it('is true when the CI status is `success`', () => {
+        store.setData({ ...mockData, ci_status: 'success' });
+
+        expect(store.isPipelinePassing).toBe(true);
+      });
+
+      it('is true when the CI status is `success-with-warnings`', () => {
+        store.setData({ ...mockData, ci_status: 'success-with-warnings' });
+
+        expect(store.isPipelinePassing).toBe(true);
+      });
+
+      it('is false when the CI status is `failed`', () => {
+        store.setData({ ...mockData, ci_status: 'failed' });
+
+        expect(store.isPipelinePassing).toBe(false);
+      });
+
+      it('is false when the CI status is anything except `success`', () => {
+        store.setData({ ...mockData, ci_status: 'foobarbaz' });
+
+        expect(store.isPipelinePassing).toBe(false);
+      });
+    });
+
+    describe('isPipelineSkipped', () => {
+      it('should set isPipelineSkipped=true when the CI status is `skipped`', () => {
+        store.setData({ ...mockData, ci_status: 'skipped' });
+
+        expect(store.isPipelineSkipped).toBe(true);
+      });
+
+      it('should set isPipelineSkipped=false when the CI status is anything except `skipped`', () => {
+        store.setData({ ...mockData, ci_status: 'foobarbaz' });
+
+        expect(store.isPipelineSkipped).toBe(false);
+      });
+    });
+
+    describe('isNothingToMergeState', () => {
+      it('returns true when nothingToMerge', () => {
+        store.state = stateKey.nothingToMerge;
+
+        expect(store.isNothingToMergeState).toBe(true);
+      });
+
+      it('returns false when not nothingToMerge', () => {
+        store.state = 'state';
+
+        expect(store.isNothingToMergeState).toBe(false);
+      });
+    });
+  });
+
+  describe('setPaths', () => {
+    it('should set the add ci config path', () => {
+      store.setData({ ...mockData });
+
+      expect(store.mergeRequestAddCiConfigPath).toBe('/group2/project2/new/pipeline');
+    });
+
+    it('should set humanAccess=Maintainer when user has that role', () => {
+      store.setData({ ...mockData });
+
+      expect(store.humanAccess).toBe('Maintainer');
+    });
+
+    it('should set pipelinesEmptySvgPath', () => {
+      store.setData({ ...mockData });
+
+      expect(store.pipelinesEmptySvgPath).toBe('/path/to/svg');
+    });
+
+    it('should set newPipelinePath', () => {
+      store.setData({ ...mockData });
+
+      expect(store.newPipelinePath).toBe('/group2/project2/pipelines/new');
+    });
+  });
+});