diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/frontend/notes/stores | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/frontend/notes/stores')
-rw-r--r-- | spec/frontend/notes/stores/actions_spec.js | 133 | ||||
-rw-r--r-- | spec/frontend/notes/stores/mutation_spec.js | 34 |
2 files changed, 155 insertions, 12 deletions
diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js index ef87cb3bee7..909a4a797ae 100644 --- a/spec/frontend/notes/stores/actions_spec.js +++ b/spec/frontend/notes/stores/actions_spec.js @@ -18,6 +18,8 @@ import { batchSuggestionsInfoMock, } from '../mock_data'; import axios from '~/lib/utils/axios_utils'; +import * as utils from '~/notes/stores/utils'; +import updateIssueConfidentialMutation from '~/sidebar/components/confidential/queries/update_issue_confidential.mutation.graphql'; const TEST_ERROR_MESSAGE = 'Test error message'; jest.mock('~/flash'); @@ -272,9 +274,54 @@ describe('Actions Notes Store', () => { }); }); + describe('fetchData', () => { + describe('given there are no notes', () => { + const lastFetchedAt = '13579'; + + beforeEach(() => { + axiosMock + .onGet(notesDataMock.notesPath) + .replyOnce(200, { notes: [], last_fetched_at: lastFetchedAt }); + }); + + it('should commit SET_LAST_FETCHED_AT', () => + testAction( + actions.fetchData, + undefined, + { notesData: notesDataMock }, + [{ type: 'SET_LAST_FETCHED_AT', payload: lastFetchedAt }], + [], + )); + }); + + describe('given there are notes', () => { + const lastFetchedAt = '12358'; + + beforeEach(() => { + axiosMock + .onGet(notesDataMock.notesPath) + .replyOnce(200, { notes: discussionMock.notes, last_fetched_at: lastFetchedAt }); + }); + + it('should dispatch updateOrCreateNotes, startTaskList and commit SET_LAST_FETCHED_AT', () => + testAction( + actions.fetchData, + undefined, + { notesData: notesDataMock }, + [{ type: 'SET_LAST_FETCHED_AT', payload: lastFetchedAt }], + [ + { type: 'updateOrCreateNotes', payload: discussionMock.notes }, + { type: 'startTaskList' }, + ], + )); + }); + }); + describe('poll', () => { beforeEach(done => { - jest.spyOn(axios, 'get'); + axiosMock + .onGet(notesDataMock.notesPath) + .reply(200, { notes: [], last_fetched_at: '123456' }, { 'poll-interval': '1000' }); store .dispatch('setNotesData', notesDataMock) @@ -283,15 +330,10 @@ describe('Actions Notes Store', () => { }); it('calls service with last fetched state', done => { - axiosMock - .onAny() - .reply(200, { notes: [], last_fetched_at: '123456' }, { 'poll-interval': '1000' }); - store .dispatch('poll') .then(() => new Promise(resolve => requestAnimationFrame(resolve))) .then(() => { - expect(axios.get).toHaveBeenCalled(); expect(store.state.lastFetchedAt).toBe('123456'); jest.advanceTimersByTime(1500); @@ -303,8 +345,9 @@ describe('Actions Notes Store', () => { }), ) .then(() => { - expect(axios.get.mock.calls.length).toBe(2); - expect(axios.get.mock.calls[axios.get.mock.calls.length - 1][1].headers).toEqual({ + const expectedGetRequests = 2; + expect(axiosMock.history.get.length).toBe(expectedGetRequests); + expect(axiosMock.history.get[expectedGetRequests - 1].headers).toMatchObject({ 'X-Last-Fetched-At': '123456', }); }) @@ -449,7 +492,7 @@ describe('Actions Notes Store', () => { it('commits ADD_NEW_NOTE and dispatches updateMergeRequestWidget', done => { testAction( actions.createNewNote, - { endpoint: `${gl.TEST_HOST}`, data: {} }, + { endpoint: `${TEST_HOST}`, data: {} }, store.state, [ { @@ -485,7 +528,7 @@ describe('Actions Notes Store', () => { it('does not commit ADD_NEW_NOTE or dispatch updateMergeRequestWidget', done => { testAction( actions.createNewNote, - { endpoint: `${gl.TEST_HOST}`, data: {} }, + { endpoint: `${TEST_HOST}`, data: {} }, store.state, [], [], @@ -508,7 +551,7 @@ describe('Actions Notes Store', () => { it('commits UPDATE_NOTE and dispatches updateMergeRequestWidget', done => { testAction( actions.toggleResolveNote, - { endpoint: `${gl.TEST_HOST}`, isResolved: true, discussion: false }, + { endpoint: `${TEST_HOST}`, isResolved: true, discussion: false }, store.state, [ { @@ -533,7 +576,7 @@ describe('Actions Notes Store', () => { it('commits UPDATE_DISCUSSION and dispatches updateMergeRequestWidget', done => { testAction( actions.toggleResolveNote, - { endpoint: `${gl.TEST_HOST}`, isResolved: true, discussion: true }, + { endpoint: `${TEST_HOST}`, isResolved: true, discussion: true }, store.state, [ { @@ -1084,6 +1127,19 @@ describe('Actions Notes Store', () => { }); }); + describe('setSelectedCommentPosition', () => { + it('calls the correct mutation with the correct args', done => { + testAction( + actions.setSelectedCommentPosition, + {}, + {}, + [{ type: mutationTypes.SET_SELECTED_COMMENT_POSITION, payload: {} }], + [], + done, + ); + }); + }); + describe('softDeleteDescriptionVersion', () => { const endpoint = '/path/to/diff/1'; const payload = { @@ -1142,6 +1198,14 @@ describe('Actions Notes Store', () => { }); }); + describe('setConfidentiality', () => { + it('calls the correct mutation with the correct args', () => { + testAction(actions.setConfidentiality, true, { noteableData: { confidential: false } }, [ + { type: mutationTypes.SET_ISSUE_CONFIDENTIAL, payload: true }, + ]); + }); + }); + describe('updateAssignees', () => { it('update the assignees state', done => { testAction( @@ -1154,4 +1218,49 @@ describe('Actions Notes Store', () => { ); }); }); + + describe('updateConfidentialityOnIssue', () => { + state = { noteableData: { confidential: false } }; + const iid = '1'; + const projectPath = 'full/path'; + const getters = { getNoteableData: { iid } }; + const actionArgs = { fullPath: projectPath, confidential: true }; + const confidential = true; + + beforeEach(() => { + jest + .spyOn(utils.gqClient, 'mutate') + .mockResolvedValue({ data: { issueSetConfidential: { issue: { confidential } } } }); + }); + + it('calls gqClient mutation one time', () => { + actions.updateConfidentialityOnIssue({ commit: () => {}, state, getters }, actionArgs); + + expect(utils.gqClient.mutate).toHaveBeenCalledTimes(1); + }); + + it('calls gqClient mutation with the correct values', () => { + actions.updateConfidentialityOnIssue({ commit: () => {}, state, getters }, actionArgs); + + expect(utils.gqClient.mutate).toHaveBeenCalledWith({ + mutation: updateIssueConfidentialMutation, + variables: { input: { iid, projectPath, confidential } }, + }); + }); + + describe('on success of mutation', () => { + it('calls commit with the correct values', () => { + const commitSpy = jest.fn(); + + return actions + .updateConfidentialityOnIssue({ commit: commitSpy, state, getters }, actionArgs) + .then(() => { + expect(commitSpy).toHaveBeenCalledWith( + mutationTypes.SET_ISSUE_CONFIDENTIAL, + confidential, + ); + }); + }); + }); + }); }); diff --git a/spec/frontend/notes/stores/mutation_spec.js b/spec/frontend/notes/stores/mutation_spec.js index 75ef007b78d..0ad18ba9b6a 100644 --- a/spec/frontend/notes/stores/mutation_spec.js +++ b/spec/frontend/notes/stores/mutation_spec.js @@ -524,6 +524,26 @@ describe('Notes Store mutations', () => { }); }); + describe('SET_SELECTED_COMMENT_POSITION', () => { + it('should set comment position state', () => { + const state = {}; + + mutations.SET_SELECTED_COMMENT_POSITION(state, {}); + + expect(state.selectedCommentPosition).toEqual({}); + }); + }); + + describe('SET_SELECTED_COMMENT_POSITION_HOVER', () => { + it('should set comment hover position state', () => { + const state = {}; + + mutations.SET_SELECTED_COMMENT_POSITION_HOVER(state, {}); + + expect(state.selectedCommentPositionHover).toEqual({}); + }); + }); + describe('DISABLE_COMMENTS', () => { it('should set comments disabled state', () => { const state = {}; @@ -806,6 +826,20 @@ describe('Notes Store mutations', () => { }); }); + describe('SET_ISSUE_CONFIDENTIAL', () => { + let state; + + beforeEach(() => { + state = { noteableData: { confidential: false } }; + }); + + it('sets sort order', () => { + mutations.SET_ISSUE_CONFIDENTIAL(state, true); + + expect(state.noteableData.confidential).toBe(true); + }); + }); + describe('UPDATE_ASSIGNEES', () => { it('should update assignees', () => { const state = { |