Commit 23e90b6e authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'vs/remove-jest-test-callback-part-two' into 'master'

Remove jest test callbacks from specs (1/3)

See merge request gitlab-org/gitlab!84479
parents f4cc4b5a 58c9a083
...@@ -89,11 +89,9 @@ describe('Badge component', () => { ...@@ -89,11 +89,9 @@ describe('Badge component', () => {
}); });
describe('behavior', () => { describe('behavior', () => {
beforeEach((done) => { beforeEach(() => {
setFixtures('<div id="dummy-element"></div>'); setFixtures('<div id="dummy-element"></div>');
createComponent({ ...dummyProps }, '#dummy-element') return createComponent({ ...dummyProps }, '#dummy-element');
.then(done)
.catch(done.fail);
}); });
it('shows a badge image after loading', () => { it('shows a badge image after loading', () => {
......
This diff is collapsed.
...@@ -29,53 +29,56 @@ describe('Batch comments store actions', () => { ...@@ -29,53 +29,56 @@ describe('Batch comments store actions', () => {
}); });
describe('addDraftToDiscussion', () => { describe('addDraftToDiscussion', () => {
it('commits ADD_NEW_DRAFT if no errors returned', (done) => { it('commits ADD_NEW_DRAFT if no errors returned', () => {
res = { id: 1 }; res = { id: 1 };
mock.onAny().reply(200, res); mock.onAny().reply(200, res);
testAction( return testAction(
actions.addDraftToDiscussion, actions.addDraftToDiscussion,
{ endpoint: TEST_HOST, data: 'test' }, { endpoint: TEST_HOST, data: 'test' },
null, null,
[{ type: 'ADD_NEW_DRAFT', payload: res }], [{ type: 'ADD_NEW_DRAFT', payload: res }],
[], [],
done,
); );
}); });
it('does not commit ADD_NEW_DRAFT if errors returned', (done) => { it('does not commit ADD_NEW_DRAFT if errors returned', () => {
mock.onAny().reply(500); mock.onAny().reply(500);
testAction( return testAction(
actions.addDraftToDiscussion, actions.addDraftToDiscussion,
{ endpoint: TEST_HOST, data: 'test' }, { endpoint: TEST_HOST, data: 'test' },
null, null,
[], [],
[], [],
done,
); );
}); });
}); });
describe('createNewDraft', () => { describe('createNewDraft', () => {
it('commits ADD_NEW_DRAFT if no errors returned', (done) => { it('commits ADD_NEW_DRAFT if no errors returned', () => {
res = { id: 1 }; res = { id: 1 };
mock.onAny().reply(200, res); mock.onAny().reply(200, res);
testAction( return testAction(
actions.createNewDraft, actions.createNewDraft,
{ endpoint: TEST_HOST, data: 'test' }, { endpoint: TEST_HOST, data: 'test' },
null, null,
[{ type: 'ADD_NEW_DRAFT', payload: res }], [{ type: 'ADD_NEW_DRAFT', payload: res }],
[], [],
done,
); );
}); });
it('does not commit ADD_NEW_DRAFT if errors returned', (done) => { it('does not commit ADD_NEW_DRAFT if errors returned', () => {
mock.onAny().reply(500); mock.onAny().reply(500);
testAction(actions.createNewDraft, { endpoint: TEST_HOST, data: 'test' }, null, [], [], done); return testAction(
actions.createNewDraft,
{ endpoint: TEST_HOST, data: 'test' },
null,
[],
[],
);
}); });
}); });
...@@ -90,7 +93,7 @@ describe('Batch comments store actions', () => { ...@@ -90,7 +93,7 @@ describe('Batch comments store actions', () => {
}; };
}); });
it('commits DELETE_DRAFT if no errors returned', (done) => { it('commits DELETE_DRAFT if no errors returned', () => {
const commit = jest.fn(); const commit = jest.fn();
const context = { const context = {
getters, getters,
...@@ -99,16 +102,12 @@ describe('Batch comments store actions', () => { ...@@ -99,16 +102,12 @@ describe('Batch comments store actions', () => {
res = { id: 1 }; res = { id: 1 };
mock.onAny().reply(200); mock.onAny().reply(200);
actions return actions.deleteDraft(context, { id: 1 }).then(() => {
.deleteDraft(context, { id: 1 }) expect(commit).toHaveBeenCalledWith('DELETE_DRAFT', 1);
.then(() => { });
expect(commit).toHaveBeenCalledWith('DELETE_DRAFT', 1);
})
.then(done)
.catch(done.fail);
}); });
it('does not commit DELETE_DRAFT if errors returned', (done) => { it('does not commit DELETE_DRAFT if errors returned', () => {
const commit = jest.fn(); const commit = jest.fn();
const context = { const context = {
getters, getters,
...@@ -116,13 +115,9 @@ describe('Batch comments store actions', () => { ...@@ -116,13 +115,9 @@ describe('Batch comments store actions', () => {
}; };
mock.onAny().reply(500); mock.onAny().reply(500);
actions return actions.deleteDraft(context, { id: 1 }).then(() => {
.deleteDraft(context, { id: 1 }) expect(commit).not.toHaveBeenCalledWith('DELETE_DRAFT', 1);
.then(() => { });
expect(commit).not.toHaveBeenCalledWith('DELETE_DRAFT', 1);
})
.then(done)
.catch(done.fail);
}); });
}); });
...@@ -137,7 +132,7 @@ describe('Batch comments store actions', () => { ...@@ -137,7 +132,7 @@ describe('Batch comments store actions', () => {
}; };
}); });
it('commits SET_BATCH_COMMENTS_DRAFTS with returned data', (done) => { it('commits SET_BATCH_COMMENTS_DRAFTS with returned data', () => {
const commit = jest.fn(); const commit = jest.fn();
const dispatch = jest.fn(); const dispatch = jest.fn();
const context = { const context = {
...@@ -151,14 +146,10 @@ describe('Batch comments store actions', () => { ...@@ -151,14 +146,10 @@ describe('Batch comments store actions', () => {
res = { id: 1 }; res = { id: 1 };
mock.onAny().reply(200, res); mock.onAny().reply(200, res);
actions return actions.fetchDrafts(context).then(() => {
.fetchDrafts(context) expect(commit).toHaveBeenCalledWith('SET_BATCH_COMMENTS_DRAFTS', { id: 1 });
.then(() => { expect(dispatch).toHaveBeenCalledWith('convertToDiscussion', '1', { root: true });
expect(commit).toHaveBeenCalledWith('SET_BATCH_COMMENTS_DRAFTS', { id: 1 }); });
expect(dispatch).toHaveBeenCalledWith('convertToDiscussion', '1', { root: true });
})
.then(done)
.catch(done.fail);
}); });
}); });
...@@ -177,32 +168,24 @@ describe('Batch comments store actions', () => { ...@@ -177,32 +168,24 @@ describe('Batch comments store actions', () => {
rootGetters = { discussionsStructuredByLineCode: 'discussions' }; rootGetters = { discussionsStructuredByLineCode: 'discussions' };
}); });
it('dispatches actions & commits', (done) => { it('dispatches actions & commits', () => {
mock.onAny().reply(200); mock.onAny().reply(200);
actions return actions.publishReview({ dispatch, commit, getters, rootGetters }).then(() => {
.publishReview({ dispatch, commit, getters, rootGetters }) expect(commit.mock.calls[0]).toEqual(['REQUEST_PUBLISH_REVIEW']);
.then(() => { expect(commit.mock.calls[1]).toEqual(['RECEIVE_PUBLISH_REVIEW_SUCCESS']);
expect(commit.mock.calls[0]).toEqual(['REQUEST_PUBLISH_REVIEW']);
expect(commit.mock.calls[1]).toEqual(['RECEIVE_PUBLISH_REVIEW_SUCCESS']);
expect(dispatch.mock.calls[0]).toEqual(['updateDiscussionsAfterPublish']); expect(dispatch.mock.calls[0]).toEqual(['updateDiscussionsAfterPublish']);
}) });
.then(done)
.catch(done.fail);
}); });
it('dispatches error commits', (done) => { it('dispatches error commits', () => {
mock.onAny().reply(500); mock.onAny().reply(500);
actions return actions.publishReview({ dispatch, commit, getters, rootGetters }).then(() => {
.publishReview({ dispatch, commit, getters, rootGetters }) expect(commit.mock.calls[0]).toEqual(['REQUEST_PUBLISH_REVIEW']);
.then(() => { expect(commit.mock.calls[1]).toEqual(['RECEIVE_PUBLISH_REVIEW_ERROR']);
expect(commit.mock.calls[0]).toEqual(['REQUEST_PUBLISH_REVIEW']); });
expect(commit.mock.calls[1]).toEqual(['RECEIVE_PUBLISH_REVIEW_ERROR']);
})
.then(done)
.catch(done.fail);
}); });
}); });
...@@ -262,7 +245,7 @@ describe('Batch comments store actions', () => { ...@@ -262,7 +245,7 @@ describe('Batch comments store actions', () => {
}); });
describe('expandAllDiscussions', () => { describe('expandAllDiscussions', () => {
it('dispatches expandDiscussion for all drafts', (done) => { it('dispatches expandDiscussion for all drafts', () => {
const state = { const state = {
drafts: [ drafts: [
{ {
...@@ -271,7 +254,7 @@ describe('Batch comments store actions', () => { ...@@ -271,7 +254,7 @@ describe('Batch comments store actions', () => {
], ],
}; };
testAction( return testAction(
actions.expandAllDiscussions, actions.expandAllDiscussions,
null, null,
state, state,
...@@ -282,7 +265,6 @@ describe('Batch comments store actions', () => { ...@@ -282,7 +265,6 @@ describe('Batch comments store actions', () => {
payload: { discussionId: '1' }, payload: { discussionId: '1' },
}, },
], ],
done,
); );
}); });
}); });
......
...@@ -166,31 +166,29 @@ describe('setFilters', () => { ...@@ -166,31 +166,29 @@ describe('setFilters', () => {
}); });
describe('performSearch', () => { describe('performSearch', () => {
it('should dispatch setFilters, fetchLists and resetIssues action', (done) => { it('should dispatch setFilters, fetchLists and resetIssues action', () => {
testAction( return testAction(
actions.performSearch, actions.performSearch,
{}, {},
{}, {},
[], [],
[{ type: 'setFilters', payload: {} }, { type: 'fetchLists' }, { type: 'resetIssues' }], [{ type: 'setFilters', payload: {} }, { type: 'fetchLists' }, { type: 'resetIssues' }],
done,
); );
}); });
}); });
describe('setActiveId', () => { describe('setActiveId', () => {
it('should commit mutation SET_ACTIVE_ID', (done) => { it('should commit mutation SET_ACTIVE_ID', () => {
const state = { const state = {
activeId: inactiveId, activeId: inactiveId,
}; };
testAction( return testAction(
actions.setActiveId, actions.setActiveId,
{ id: 1, sidebarType: 'something' }, { id: 1, sidebarType: 'something' },
state, state,
[{ type: types.SET_ACTIVE_ID, payload: { id: 1, sidebarType: 'something' } }], [{ type: types.SET_ACTIVE_ID, payload: { id: 1, sidebarType: 'something' } }],
[], [],
done,
); );
}); });
}); });
...@@ -219,10 +217,10 @@ describe('fetchLists', () => { ...@@ -219,10 +217,10 @@ describe('fetchLists', () => {
const formattedLists = formatBoardLists(queryResponse.data.group.board.lists); const formattedLists = formatBoardLists(queryResponse.data.group.board.lists);
it('should commit mutations RECEIVE_BOARD_LISTS_SUCCESS on success', (done) => { it('should commit mutations RECEIVE_BOARD_LISTS_SUCCESS on success', () => {
jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse); jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse);
testAction( return testAction(
actions.fetchLists, actions.fetchLists,
{}, {},
state, state,
...@@ -233,14 +231,13 @@ describe('fetchLists', () => { ...@@ -233,14 +231,13 @@ describe('fetchLists', () => {
}, },
], ],
[], [],
done,
); );
}); });
it('should commit mutations RECEIVE_BOARD_LISTS_FAILURE on failure', (done) => { it('should commit mutations RECEIVE_BOARD_LISTS_FAILURE on failure', () => {
jest.spyOn(gqlClient, 'query').mockResolvedValue(Promise.reject()); jest.spyOn(gqlClient, 'query').mockResolvedValue(Promise.reject());
testAction( return testAction(
actions.fetchLists, actions.fetchLists,
{}, {},
state, state,
...@@ -250,11 +247,10 @@ describe('fetchLists', () => { ...@@ -250,11 +247,10 @@ describe('fetchLists', () => {
}, },
], ],
[], [],
done,
); );
}); });
it('dispatch createList action when backlog list does not exist and is not hidden', (done) => { it('dispatch createList action when backlog list does not exist and is not hidden', () => {
queryResponse = { queryResponse = {
data: { data: {
group: { group: {
...@@ -269,7 +265,7 @@ describe('fetchLists', () => { ...@@ -269,7 +265,7 @@ describe('fetchLists', () => {
}; };
jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse); jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse);
testAction( return testAction(
actions.fetchLists, actions.fetchLists,
{}, {},
state, state,
...@@ -280,7 +276,6 @@ describe('fetchLists', () => { ...@@ -280,7 +276,6 @@ describe('fetchLists', () => {
}, },
], ],
[{ type: 'createList', payload: { backlog: true } }], [{ type: 'createList', payload: { backlog: true } }],
done,
); );
}); });
...@@ -951,10 +946,10 @@ describe('fetchItemsForList', () => { ...@@ -951,10 +946,10 @@ describe('fetchItemsForList', () => {
}); });
}); });
it('should commit mutations REQUEST_ITEMS_FOR_LIST and RECEIVE_ITEMS_FOR_LIST_SUCCESS on success', (done) => { it('should commit mutations REQUEST_ITEMS_FOR_LIST and RECEIVE_ITEMS_FOR_LIST_SUCCESS on success', () => {
jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse); jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse);
testAction( return testAction(
actions.fetchItemsForList, actions.fetchItemsForList,
{ listId }, { listId },
state, state,
...@@ -973,14 +968,13 @@ describe('fetchItemsForList', () => { ...@@ -973,14 +968,13 @@ describe('fetchItemsForList', () => {
}, },
], ],
[], [],
done,
); );
}); });
it('should commit mutations REQUEST_ITEMS_FOR_LIST and RECEIVE_ITEMS_FOR_LIST_FAILURE on failure', (done) => { it('should commit mutations REQUEST_ITEMS_FOR_LIST and RECEIVE_ITEMS_FOR_LIST_FAILURE on failure', () => {
jest.spyOn(gqlClient, 'query').mockResolvedValue(Promise.reject()); jest.spyOn(gqlClient, 'query').mockResolvedValue(Promise.reject());
testAction( return testAction(
actions.fetchItemsForList, actions.fetchItemsForList,
{ listId }, { listId },
state, state,
...@@ -996,7 +990,6 @@ describe('fetchItemsForList', () => { ...@@ -996,7 +990,6 @@ describe('fetchItemsForList', () => {
{ type: types.RECEIVE_ITEMS_FOR_LIST_FAILURE, payload: listId }, { type: types.RECEIVE_ITEMS_FOR_LIST_FAILURE, payload: listId },
], ],
[], [],
done,
); );
}); });
}); });
...@@ -1398,8 +1391,8 @@ describe('setAssignees', () => { ...@@ -1398,8 +1391,8 @@ describe('setAssignees', () => {
const node = { username: 'name' }; const node = { username: 'name' };
describe('when succeeds', () => { describe('when succeeds', () => {
it('calls the correct mutation with the correct values', (done) => { it('calls the correct mutation with the correct values', () => {
testAction( return testAction(
actions.setAssignees, actions.setAssignees,
{ assignees: [node], iid: '1' }, { assignees: [node], iid: '1' },
{ commit: () => {} }, { commit: () => {} },
...@@ -1410,7 +1403,6 @@ describe('setAssignees', () => { ...@@ -1410,7 +1403,6 @@ describe('setAssignees', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
...@@ -1728,7 +1720,7 @@ describe('setActiveItemSubscribed', () => { ...@@ -1728,7 +1720,7 @@ describe('setActiveItemSubscribed', () => {
projectPath: 'gitlab-org/gitlab-test', projectPath: 'gitlab-org/gitlab-test',
}; };
it('should commit subscribed status', (done) => { it('should commit subscribed status', () => {
jest.spyOn(gqlClient, 'mutate').mockResolvedValue({ jest.spyOn(gqlClient, 'mutate').mockResolvedValue({
data: { data: {
updateIssuableSubscription: { updateIssuableSubscription: {
...@@ -1746,7 +1738,7 @@ describe('setActiveItemSubscribed', () => { ...@@ -1746,7 +1738,7 @@ describe('setActiveItemSubscribed', () => {
value: subscribedState, value: subscribedState,
}; };
testAction( return testAction(
actions.setActiveItemSubscribed, actions.setActiveItemSubscribed,
input, input,
{ ...state, ...getters }, { ...state, ...getters },
...@@ -1757,7 +1749,6 @@ describe('setActiveItemSubscribed', () => { ...@@ -1757,7 +1749,6 @@ describe('setActiveItemSubscribed', () => {
}, },
], ],
[], [],
done,
); );
}); });
...@@ -1783,7 +1774,7 @@ describe('setActiveItemTitle', () => { ...@@ -1783,7 +1774,7 @@ describe('setActiveItemTitle', () => {
projectPath: 'h/b', projectPath: 'h/b',
}; };
it('should commit title after setting the issue', (done) => { it('should commit title after setting the issue', () => {
jest.spyOn(gqlClient, 'mutate').mockResolvedValue({ jest.spyOn(gqlClient, 'mutate').mockResolvedValue({
data: { data: {
updateIssuableTitle: { updateIssuableTitle: {
...@@ -1801,7 +1792,7 @@ describe('setActiveItemTitle', () => { ...@@ -1801,7 +1792,7 @@ describe('setActiveItemTitle', () => {
value: testTitle, value: testTitle,
}; };
testAction( return testAction(
actions.setActiveItemTitle, actions.setActiveItemTitle,
input, input,
{ ...state, ...getters }, { ...state, ...getters },
...@@ -1812,7 +1803,6 @@ describe('setActiveItemTitle', () => { ...@@ -1812,7 +1803,6 @@ describe('setActiveItemTitle', () => {
}, },
], ],
[], [],
done,
); );
}); });
...@@ -1829,14 +1819,14 @@ describe('setActiveItemConfidential', () => { ...@@ -1829,14 +1819,14 @@ describe('setActiveItemConfidential', () => {
const state = { boardItems: { [mockIssue.id]: mockIssue } }; const state = { boardItems: { [mockIssue.id]: mockIssue } };
const getters = { activeBoardItem: mockIssue }; const getters = { activeBoardItem: mockIssue };
it('set confidential value on board item', (done) => { it('set confidential value on board item', () => {
const payload = { const payload = {
itemId: getters.activeBoardItem.id, itemId: getters.activeBoardItem.id,
prop: 'confidential', prop: 'confidential',
value: true, value: true,
}; };
testAction( return testAction(
actions.setActiveItemConfidential, actions.setActiveItemConfidential,
true, true,
{ ...state, ...getters }, { ...state, ...getters },
...@@ -1847,7 +1837,6 @@ describe('setActiveItemConfidential', () => { ...@@ -1847,7 +1837,6 @@ describe('setActiveItemConfidential', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
...@@ -1876,10 +1865,10 @@ describe('fetchGroupProjects', () => { ...@@ -1876,10 +1865,10 @@ describe('fetchGroupProjects', () => {
}, },
}; };
it('should commit mutations REQUEST_GROUP_PROJECTS and RECEIVE_GROUP_PROJECTS_SUCCESS on success', (done) => { it('should commit mutations REQUEST_GROUP_PROJECTS and RECEIVE_GROUP_PROJECTS_SUCCESS on success', () => {
jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse); jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse);
testAction( return testAction(
actions.fetchGroupProjects, actions.fetchGroupProjects,
{}, {},
state, state,
...@@ -1894,14 +1883,13 @@ describe('fetchGroupProjects', () => { ...@@ -1894,14 +1883,13 @@ describe('fetchGroupProjects', () => {
}, },
], ],
[], [],
done,
); );
}); });
it('should commit mutations REQUEST_GROUP_PROJECTS and RECEIVE_GROUP_PROJECTS_FAILURE on failure', (done) => { it('should commit mutations REQUEST_GROUP_PROJECTS and RECEIVE_GROUP_PROJECTS_FAILURE on failure', () => {
jest.spyOn(gqlClient, 'query').mockRejectedValue(); jest.spyOn(gqlClient, 'query').mockRejectedValue();
testAction( return testAction(
actions.fetchGroupProjects, actions.fetchGroupProjects,
{}, {},
state, state,
...@@ -1915,16 +1903,15 @@ describe('fetchGroupProjects', () => { ...@@ -1915,16 +1903,15 @@ describe('fetchGroupProjects', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
describe('setSelectedProject', () => { describe('setSelectedProject', () => {
it('should commit mutation SET_SELECTED_PROJECT', (done) => { it('should commit mutation SET_SELECTED_PROJECT', () => {
const project = mockGroupProjects[0]; const project = mockGroupProjects[0];
testAction( return testAction(
actions.setSelectedProject, actions.setSelectedProject,
project, project,
{}, {},
...@@ -1935,7 +1922,6 @@ describe('setSelectedProject', () => { ...@@ -1935,7 +1922,6 @@ describe('setSelectedProject', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
......
...@@ -95,70 +95,82 @@ describe('apolloCaptchaLink', () => { ...@@ -95,70 +95,82 @@ describe('apolloCaptchaLink', () => {
return { operationName: 'operation', variables: {}, setContext: mockContext }; return { operationName: 'operation', variables: {}, setContext: mockContext };
} }
it('successful responses are passed through', (done) => { it('successful responses are passed through', () => {
setupLink(SUCCESS_RESPONSE); setupLink(SUCCESS_RESPONSE);
link.request(mockOperation()).subscribe((result) => {
expect(result).toEqual(SUCCESS_RESPONSE); return new Promise((resolve) => {
expect(mockLinkImplementation).toHaveBeenCalledTimes(1); link.request(mockOperation()).subscribe((result) => {
expect(waitForCaptchaToBeSolved).not.toHaveBeenCalled(); expect(result).toEqual(SUCCESS_RESPONSE);
done(); expect(mockLinkImplementation).toHaveBeenCalledTimes(1);
expect(waitForCaptchaToBeSolved).not.toHaveBeenCalled();
resolve();
});
}); });
}); });
it('non-spam related errors are passed through', (done) => { it('non-spam related errors are passed through', () => {
setupLink(NON_CAPTCHA_ERROR_RESPONSE); setupLink(NON_CAPTCHA_ERROR_RESPONSE);
link.request(mockOperation()).subscribe((result) => {
expect(result).toEqual(NON_CAPTCHA_ERROR_RESPONSE); return new Promise((resolve) => {
expect(mockLinkImplementation).toHaveBeenCalledTimes(1); link.request(mockOperation()).subscribe((result) => {
expect(mockContext).not.toHaveBeenCalled(); expect(result).toEqual(NON_CAPTCHA_ERROR_RESPONSE);
expect(waitForCaptchaToBeSolved).not.toHaveBeenCalled(); expect(mockLinkImplementation).toHaveBeenCalledTimes(1);
done(); expect(mockContext).not.toHaveBeenCalled();
expect(waitForCaptchaToBeSolved).not.toHaveBeenCalled();
resolve();
});
}); });
}); });
it('unresolvable spam errors are passed through', (done) => { it('unresolvable spam errors are passed through', () => {
setupLink(SPAM_ERROR_RESPONSE); setupLink(SPAM_ERROR_RESPONSE);
link.request(mockOperation()).subscribe((result) => { return new Promise((resolve) => {
expect(result).toEqual(SPAM_ERROR_RESPONSE); link.request(mockOperation()).subscribe((result) => {
expect(mockLinkImplementation).toHaveBeenCalledTimes(1); expect(result).toEqual(SPAM_ERROR_RESPONSE);
expect(mockContext).not.toHaveBeenCalled(); expect(mockLinkImplementation).toHaveBeenCalledTimes(1);
expect(waitForCaptchaToBeSolved).not.toHaveBeenCalled(); expect(mockContext).not.toHaveBeenCalled();
done(); expect(waitForCaptchaToBeSolved).not.toHaveBeenCalled();
resolve();
});
}); });
}); });
describe('resolvable spam errors', () => { describe('resolvable spam errors', () => {
it('re-submits request with spam headers if the captcha modal was solved correctly', (done) => { it('re-submits request with spam headers if the captcha modal was solved correctly', () => {
waitForCaptchaToBeSolved.mockResolvedValue(CAPTCHA_RESPONSE); waitForCaptchaToBeSolved.mockResolvedValue(CAPTCHA_RESPONSE);
setupLink(CAPTCHA_ERROR_RESPONSE, SUCCESS_RESPONSE); setupLink(CAPTCHA_ERROR_RESPONSE, SUCCESS_RESPONSE);
link.request(mockOperation()).subscribe((result) => { return new Promise((resolve) => {
expect(result).toEqual(SUCCESS_RESPONSE); link.request(mockOperation()).subscribe((result) => {
expect(waitForCaptchaToBeSolved).toHaveBeenCalledWith(CAPTCHA_SITE_KEY); expect(result).toEqual(SUCCESS_RESPONSE);
expect(mockContext).toHaveBeenCalledWith({ expect(waitForCaptchaToBeSolved).toHaveBeenCalledWith(CAPTCHA_SITE_KEY);
headers: { expect(mockContext).toHaveBeenCalledWith({
'X-GitLab-Captcha-Response': CAPTCHA_RESPONSE, headers: {
'X-GitLab-Spam-Log-Id': SPAM_LOG_ID, 'X-GitLab-Captcha-Response': CAPTCHA_RESPONSE,
}, 'X-GitLab-Spam-Log-Id': SPAM_LOG_ID,
},
});
expect(mockLinkImplementation).toHaveBeenCalledTimes(2);
resolve();
}); });
expect(mockLinkImplementation).toHaveBeenCalledTimes(2);
done();
}); });
}); });
it('throws error if the captcha modal was not solved correctly', (done) => { it('throws error if the captcha modal was not solved correctly', () => {
const error = new UnsolvedCaptchaError(); const error = new UnsolvedCaptchaError();
waitForCaptchaToBeSolved.mockRejectedValue(error); waitForCaptchaToBeSolved.mockRejectedValue(error);
setupLink(CAPTCHA_ERROR_RESPONSE, SUCCESS_RESPONSE); setupLink(CAPTCHA_ERROR_RESPONSE, SUCCESS_RESPONSE);
link.request(mockOperation()).subscribe({ return new Promise((resolve, reject) => {
next: done.catch, link.request(mockOperation()).subscribe({
error: (result) => { next: reject,
expect(result).toEqual(error); error: (result) => {
expect(waitForCaptchaToBeSolved).toHaveBeenCalledWith(CAPTCHA_SITE_KEY); expect(result).toEqual(error);
expect(mockContext).not.toHaveBeenCalled(); expect(waitForCaptchaToBeSolved).toHaveBeenCalledWith(CAPTCHA_SITE_KEY);
expect(mockLinkImplementation).toHaveBeenCalledTimes(1); expect(mockContext).not.toHaveBeenCalled();
done(); expect(mockLinkImplementation).toHaveBeenCalledTimes(1);
}, resolve();
},
});
}); });
}); });
}); });
......
...@@ -86,10 +86,10 @@ describe('CI variable list store actions', () => { ...@@ -86,10 +86,10 @@ describe('CI variable list store actions', () => {
}); });
describe('deleteVariable', () => { describe('deleteVariable', () => {
it('dispatch correct actions on successful deleted variable', (done) => { it('dispatch correct actions on successful deleted variable', () => {
mock.onPatch(state.endpoint).reply(200); mock.onPatch(state.endpoint).reply(200);
testAction( return testAction(
actions.deleteVariable, actions.deleteVariable,
{}, {},
state, state,
...@@ -99,16 +99,13 @@ describe('CI variable list store actions', () => { ...@@ -99,16 +99,13 @@ describe('CI variable list store actions', () => {
{ type: 'receiveDeleteVariableSuccess' }, { type: 'receiveDeleteVariableSuccess' },
{ type: 'fetchVariables' }, { type: 'fetchVariables' },
], ],
() => {
done();
},
); );
}); });
it('should show flash error and set error in state on delete failure', (done) => { it('should show flash error and set error in state on delete failure', async () => {
mock.onPatch(state.endpoint).reply(500, ''); mock.onPatch(state.endpoint).reply(500, '');
testAction( await testAction(
actions.deleteVariable, actions.deleteVariable,
{}, {},
state, state,
...@@ -120,19 +117,16 @@ describe('CI variable list store actions', () => { ...@@ -120,19 +117,16 @@ describe('CI variable list store actions', () => {
payload: payloadError, payload: payloadError,
}, },
], ],
() => {
expect(createFlash).toHaveBeenCalled();
done();
},
); );
expect(createFlash).toHaveBeenCalled();
}); });
}); });
describe('updateVariable', () => { describe('updateVariable', () => {
it('dispatch correct actions on successful updated variable', (done) => { it('dispatch correct actions on successful updated variable', () => {
mock.onPatch(state.endpoint).reply(200); mock.onPatch(state.endpoint).reply(200);
testAction( return testAction(
actions.updateVariable, actions.updateVariable,
{}, {},
state, state,
...@@ -142,16 +136,13 @@ describe('CI variable list store actions', () => { ...@@ -142,16 +136,13 @@ describe('CI variable list store actions', () => {
{ type: 'receiveUpdateVariableSuccess' }, { type: 'receiveUpdateVariableSuccess' },
{ type: 'fetchVariables' }, { type: 'fetchVariables' },
], ],
() => {
done();
},
); );
}); });
it('should show flash error and set error in state on update failure', (done) => { it('should show flash error and set error in state on update failure', async () => {
mock.onPatch(state.endpoint).reply(500, ''); mock.onPatch(state.endpoint).reply(500, '');
testAction( await testAction(
actions.updateVariable, actions.updateVariable,
mockVariable, mockVariable,
state, state,
...@@ -163,19 +154,16 @@ describe('CI variable list store actions', () => { ...@@ -163,19 +154,16 @@ describe('CI variable list store actions', () => {
payload: payloadError, payload: payloadError,
}, },
], ],
() => {
expect(createFlash).toHaveBeenCalled();
done();
},
); );
expect(createFlash).toHaveBeenCalled();
}); });
}); });
describe('addVariable', () => { describe('addVariable', () => {
it('dispatch correct actions on successful added variable', (done) => { it('dispatch correct actions on successful added variable', () => {
mock.onPatch(state.endpoint).reply(200); mock.onPatch(state.endpoint).reply(200);
testAction( return testAction(
actions.addVariable, actions.addVariable,
{}, {},
state, state,
...@@ -185,16 +173,13 @@ describe('CI variable list store actions', () => { ...@@ -185,16 +173,13 @@ describe('CI variable list store actions', () => {
{ type: 'receiveAddVariableSuccess' }, { type: 'receiveAddVariableSuccess' },
{ type: 'fetchVariables' }, { type: 'fetchVariables' },
], ],
() => {
done();
},
); );
}); });
it('should show flash error and set error in state on add failure', (done) => { it('should show flash error and set error in state on add failure', async () => {
mock.onPatch(state.endpoint).reply(500, ''); mock.onPatch(state.endpoint).reply(500, '');
testAction( await testAction(
actions.addVariable, actions.addVariable,
{}, {},
state, state,
...@@ -206,19 +191,16 @@ describe('CI variable list store actions', () => { ...@@ -206,19 +191,16 @@ describe('CI variable list store actions', () => {
payload: payloadError, payload: payloadError,
}, },
], ],
() => {
expect(createFlash).toHaveBeenCalled();
done();
},
); );
expect(createFlash).toHaveBeenCalled();
}); });
}); });
describe('fetchVariables', () => { describe('fetchVariables', () => {
it('dispatch correct actions on fetchVariables', (done) => { it('dispatch correct actions on fetchVariables', () => {
mock.onGet(state.endpoint).reply(200, { variables: mockData.mockVariables }); mock.onGet(state.endpoint).reply(200, { variables: mockData.mockVariables });
testAction( return testAction(
actions.fetchVariables, actions.fetchVariables,
{}, {},
state, state,
...@@ -230,29 +212,24 @@ describe('CI variable list store actions', () => { ...@@ -230,29 +212,24 @@ describe('CI variable list store actions', () => {
payload: prepareDataForDisplay(mockData.mockVariables), payload: prepareDataForDisplay(mockData.mockVariables),
}, },
], ],
() => {
done();
},
); );
}); });
it('should show flash error and set error in state on fetch variables failure', (done) => { it('should show flash error and set error in state on fetch variables failure', async () => {
mock.onGet(state.endpoint).reply(500); mock.onGet(state.endpoint).reply(500);
testAction(actions.fetchVariables, {}, state, [], [{ type: 'requestVariables' }], () => { await testAction(actions.fetchVariables, {}, state, [], [{ type: 'requestVariables' }]);
expect(createFlash).toHaveBeenCalledWith({ expect(createFlash).toHaveBeenCalledWith({
message: 'There was an error fetching the variables.', message: 'There was an error fetching the variables.',
});
done();
}); });
}); });
}); });
describe('fetchEnvironments', () => { describe('fetchEnvironments', () => {
it('dispatch correct actions on fetchEnvironments', (done) => { it('dispatch correct actions on fetchEnvironments', () => {
Api.environments = jest.fn().mockResolvedValue({ data: mockData.mockEnvironments }); Api.environments = jest.fn().mockResolvedValue({ data: mockData.mockEnvironments });
testAction( return testAction(
actions.fetchEnvironments, actions.fetchEnvironments,
{}, {},
state, state,
...@@ -264,28 +241,17 @@ describe('CI variable list store actions', () => { ...@@ -264,28 +241,17 @@ describe('CI variable list store actions', () => {
payload: prepareEnvironments(mockData.mockEnvironments), payload: prepareEnvironments(mockData.mockEnvironments),
}, },
], ],
() => {
done();
},
); );
}); });
it('should show flash error and set error in state on fetch environments failure', (done) => { it('should show flash error and set error in state on fetch environments failure', async () => {
Api.environments = jest.fn().mockRejectedValue(); Api.environments = jest.fn().mockRejectedValue();
testAction( await testAction(actions.fetchEnvironments, {}, state, [], [{ type: 'requestEnvironments' }]);
actions.fetchEnvironments,
{}, expect(createFlash).toHaveBeenCalledWith({
state, message: 'There was an error fetching the environments information.',
[], });
[{ type: 'requestEnvironments' }],
() => {
expect(createFlash).toHaveBeenCalledWith({
message: 'There was an error fetching the environments information.',
});
done();
},
);
}); });
}); });
......
...@@ -24,14 +24,12 @@ describe('Clusters store actions', () => { ...@@ -24,14 +24,12 @@ describe('Clusters store actions', () => {
captureException.mockRestore(); captureException.mockRestore();
}); });
it('should report sentry error', (done) => { it('should report sentry error', async () => {
const sentryError = new Error('New Sentry Error'); const sentryError = new Error('New Sentry Error');
const tag = 'sentryErrorTag'; const tag = 'sentryErrorTag';
testAction(actions.reportSentryError, { error: sentryError, tag }, {}, [], [], () => { await testAction(actions.reportSentryError, { error: sentryError, tag }, {}, [], []);
expect(captureException).toHaveBeenCalledWith(sentryError); expect(captureException).toHaveBeenCalledWith(sentryError);
done();
});
}); });
}); });
...@@ -62,10 +60,10 @@ describe('Clusters store actions', () => { ...@@ -62,10 +60,10 @@ describe('Clusters store actions', () => {
afterEach(() => mock.restore()); afterEach(() => mock.restore());
it('should commit SET_CLUSTERS_DATA with received response', (done) => { it('should commit SET_CLUSTERS_DATA with received response', () => {
mock.onGet().reply(200, apiData, headers); mock.onGet().reply(200, apiData, headers);
testAction( return testAction(
actions.fetchClusters, actions.fetchClusters,
{ endpoint: apiData.endpoint }, { endpoint: apiData.endpoint },
{}, {},
...@@ -75,14 +73,13 @@ describe('Clusters store actions', () => { ...@@ -75,14 +73,13 @@ describe('Clusters store actions', () => {
{ type: types.SET_LOADING_CLUSTERS, payload: false }, { type: types.SET_LOADING_CLUSTERS, payload: false },
], ],
[], [],
() => done(),
); );
}); });
it('should show flash on API error', (done) => { it('should show flash on API error', async () => {
mock.onGet().reply(400, 'Not Found'); mock.onGet().reply(400, 'Not Found');
testAction( await testAction(
actions.fetchClusters, actions.fetchClusters,
{ endpoint: apiData.endpoint }, { endpoint: apiData.endpoint },
{}, {},
...@@ -100,13 +97,10 @@ describe('Clusters store actions', () => { ...@@ -100,13 +97,10 @@ describe('Clusters store actions', () => {
}, },
}, },
], ],
() => {
expect(createFlash).toHaveBeenCalledWith({
message: expect.stringMatching('error'),
});
done();
},
); );
expect(createFlash).toHaveBeenCalledWith({
message: expect.stringMatching('error'),
});
}); });
describe('multiple api requests', () => { describe('multiple api requests', () => {
...@@ -128,8 +122,8 @@ describe('Clusters store actions', () => { ...@@ -128,8 +122,8 @@ describe('Clusters store actions', () => {
pollStop.mockRestore(); pollStop.mockRestore();
}); });
it('should stop polling after MAX Requests', (done) => { it('should stop polling after MAX Requests', async () => {
testAction( await testAction(
actions.fetchClusters, actions.fetchClusters,
{ endpoint: apiData.endpoint }, { endpoint: apiData.endpoint },
{}, {},
...@@ -139,47 +133,43 @@ describe('Clusters store actions', () => { ...@@ -139,47 +133,43 @@ describe('Clusters store actions', () => {
{ type: types.SET_LOADING_CLUSTERS, payload: false }, { type: types.SET_LOADING_CLUSTERS, payload: false },
], ],
[], [],
() => { );
expect(pollRequest).toHaveBeenCalledTimes(1); expect(pollRequest).toHaveBeenCalledTimes(1);
expect(pollStop).toHaveBeenCalledTimes(0);
jest.advanceTimersByTime(pollInterval);
return waitForPromises()
.then(() => {
expect(pollRequest).toHaveBeenCalledTimes(2);
expect(pollStop).toHaveBeenCalledTimes(0); expect(pollStop).toHaveBeenCalledTimes(0);
jest.advanceTimersByTime(pollInterval); jest.advanceTimersByTime(pollInterval);
})
waitForPromises() .then(() => waitForPromises())
.then(() => { .then(() => {
expect(pollRequest).toHaveBeenCalledTimes(2); expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS);
expect(pollStop).toHaveBeenCalledTimes(0); expect(pollStop).toHaveBeenCalledTimes(0);
jest.advanceTimersByTime(pollInterval); jest.advanceTimersByTime(pollInterval);
}) })
.then(() => waitForPromises()) .then(() => waitForPromises())
.then(() => { .then(() => {
expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS); expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS + 1);
expect(pollStop).toHaveBeenCalledTimes(0); // Stops poll once it exceeds the MAX_REQUESTS limit
jest.advanceTimersByTime(pollInterval); expect(pollStop).toHaveBeenCalledTimes(1);
}) jest.advanceTimersByTime(pollInterval);
.then(() => waitForPromises()) })
.then(() => { .then(() => waitForPromises())
expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS + 1); .then(() => {
// Stops poll once it exceeds the MAX_REQUESTS limit // Additional poll requests are not made once pollStop is called
expect(pollStop).toHaveBeenCalledTimes(1); expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS + 1);
jest.advanceTimersByTime(pollInterval); expect(pollStop).toHaveBeenCalledTimes(1);
}) });
.then(() => waitForPromises())
.then(() => {
// Additional poll requests are not made once pollStop is called
expect(pollRequest).toHaveBeenCalledTimes(MAX_REQUESTS + 1);
expect(pollStop).toHaveBeenCalledTimes(1);
})
.then(done)
.catch(done.fail);
},
);
}); });
it('should stop polling and report to Sentry when data is invalid', (done) => { it('should stop polling and report to Sentry when data is invalid', async () => {
const badApiResponse = { clusters: {} }; const badApiResponse = { clusters: {} };
mock.onGet().reply(200, badApiResponse, pollHeaders); mock.onGet().reply(200, badApiResponse, pollHeaders);
testAction( await testAction(
actions.fetchClusters, actions.fetchClusters,
{ endpoint: apiData.endpoint }, { endpoint: apiData.endpoint },
{}, {},
...@@ -202,12 +192,9 @@ describe('Clusters store actions', () => { ...@@ -202,12 +192,9 @@ describe('Clusters store actions', () => {
}, },
}, },
], ],
() => {
expect(pollRequest).toHaveBeenCalledTimes(1);
expect(pollStop).toHaveBeenCalledTimes(1);
done();
},
); );
expect(pollRequest).toHaveBeenCalledTimes(1);
expect(pollStop).toHaveBeenCalledTimes(1);
}); });
}); });
}); });
......
...@@ -10,14 +10,13 @@ describe('Code navigation actions', () => { ...@@ -10,14 +10,13 @@ describe('Code navigation actions', () => {
const wrapTextNodes = true; const wrapTextNodes = true;
describe('setInitialData', () => { describe('setInitialData', () => {
it('commits SET_INITIAL_DATA', (done) => { it('commits SET_INITIAL_DATA', () => {
testAction( return testAction(
actions.setInitialData, actions.setInitialData,
{ projectPath: 'test', wrapTextNodes }, { projectPath: 'test', wrapTextNodes },
{}, {},
[{ type: 'SET_INITIAL_DATA', payload: { projectPath: 'test', wrapTextNodes } }], [{ type: 'SET_INITIAL_DATA', payload: { projectPath: 'test', wrapTextNodes } }],
[], [],
done,
); );
}); });
}); });
...@@ -59,8 +58,8 @@ describe('Code navigation actions', () => { ...@@ -59,8 +58,8 @@ describe('Code navigation actions', () => {
]); ]);
}); });
it('commits REQUEST_DATA_SUCCESS with normalized data', (done) => { it('commits REQUEST_DATA_SUCCESS with normalized data', () => {
testAction( return testAction(
actions.fetchData, actions.fetchData,
null, null,
state, state,
...@@ -82,12 +81,11 @@ describe('Code navigation actions', () => { ...@@ -82,12 +81,11 @@ describe('Code navigation actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
it('calls addInteractionClass with data', (done) => { it('calls addInteractionClass with data', () => {
testAction( return testAction(
actions.fetchData, actions.fetchData,
null, null,
state, state,
...@@ -109,20 +107,17 @@ describe('Code navigation actions', () => { ...@@ -109,20 +107,17 @@ describe('Code navigation actions', () => {
}, },
], ],
[], [],
) ).then(() => {
.then(() => { expect(addInteractionClass).toHaveBeenCalledWith({
expect(addInteractionClass).toHaveBeenCalledWith({ path: 'index.js',
path: 'index.js', d: {
d: { start_line: 0,
start_line: 0, start_char: 0,
start_char: 0, hover: { value: '123' },
hover: { value: '123' }, },
}, wrapTextNodes,
wrapTextNodes, });
}); });
})
.then(done)
.catch(done.fail);
}); });
}); });
...@@ -131,14 +126,13 @@ describe('Code navigation actions', () => { ...@@ -131,14 +126,13 @@ describe('Code navigation actions', () => {
mock.onGet(codeNavigationPath).replyOnce(500); mock.onGet(codeNavigationPath).replyOnce(500);
}); });
it('dispatches requestDataError', (done) => { it('dispatches requestDataError', () => {
testAction( return testAction(
actions.fetchData, actions.fetchData,
null, null,
state, state,
[{ type: 'REQUEST_DATA' }], [{ type: 'REQUEST_DATA' }],
[{ type: 'requestDataError' }], [{ type: 'requestDataError' }],
done,
); );
}); });
}); });
...@@ -186,20 +180,20 @@ describe('Code navigation actions', () => { ...@@ -186,20 +180,20 @@ describe('Code navigation actions', () => {
target = document.querySelector('.js-test'); target = document.querySelector('.js-test');
}); });
it('returns early when no data exists', (done) => { it('returns early when no data exists', () => {
testAction(actions.showDefinition, { target }, {}, [], [], done); return testAction(actions.showDefinition, { target }, {}, [], []);
}); });
it('commits SET_CURRENT_DEFINITION when target is not code navitation element', (done) => { it('commits SET_CURRENT_DEFINITION when target is not code navitation element', () => {
testAction(actions.showDefinition, { target }, { data: {} }, [], [], done); return testAction(actions.showDefinition, { target }, { data: {} }, [], []);
}); });
it('commits SET_CURRENT_DEFINITION with LSIF data', (done) => { it('commits SET_CURRENT_DEFINITION with LSIF data', () => {
target.classList.add('js-code-navigation'); target.classList.add('js-code-navigation');
target.setAttribute('data-line-index', '0'); target.setAttribute('data-line-index', '0');
target.setAttribute('data-char-index', '0'); target.setAttribute('data-char-index', '0');
testAction( return testAction(
actions.showDefinition, actions.showDefinition,
{ target }, { target },
{ data: { 'index.js': { '0:0': { hover: 'test' } } } }, { data: { 'index.js': { '0:0': { hover: 'test' } } } },
...@@ -214,7 +208,6 @@ describe('Code navigation actions', () => { ...@@ -214,7 +208,6 @@ describe('Code navigation actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
......
...@@ -120,18 +120,20 @@ describe('Pipelines table in Commits and Merge requests', () => { ...@@ -120,18 +120,20 @@ describe('Pipelines table in Commits and Merge requests', () => {
}); });
describe('pipeline badge counts', () => { describe('pipeline badge counts', () => {
it('should receive update-pipelines-count event', (done) => { it('should receive update-pipelines-count event', () => {
const element = document.createElement('div'); const element = document.createElement('div');
document.body.appendChild(element); document.body.appendChild(element);
element.addEventListener('update-pipelines-count', (event) => { return new Promise((resolve) => {
expect(event.detail.pipelineCount).toEqual(10); element.addEventListener('update-pipelines-count', (event) => {
done(); expect(event.detail.pipelineCount).toEqual(10);
}); resolve();
});
createComponent(); createComponent();
element.appendChild(wrapper.vm.$el); element.appendChild(wrapper.vm.$el);
});
}); });
}); });
}); });
......
...@@ -200,13 +200,15 @@ describe('content_editor/extensions/attachment', () => { ...@@ -200,13 +200,15 @@ describe('content_editor/extensions/attachment', () => {
}); });
}); });
it('emits an alert event that includes an error message', (done) => { it('emits an alert event that includes an error message', () => {
tiptapEditor.commands.uploadAttachment({ file }); tiptapEditor.commands.uploadAttachment({ file });
eventHub.$on('alert', ({ message, variant }) => { return new Promise((resolve) => {
expect(variant).toBe(VARIANT_DANGER); eventHub.$on('alert', ({ message, variant }) => {
expect(message).toBe('An error occurred while uploading the file. Please try again.'); expect(variant).toBe(VARIANT_DANGER);
done(); expect(message).toBe('An error occurred while uploading the file. Please try again.');
resolve();
});
}); });
}); });
}); });
...@@ -277,13 +279,12 @@ describe('content_editor/extensions/attachment', () => { ...@@ -277,13 +279,12 @@ describe('content_editor/extensions/attachment', () => {
}); });
}); });
it('emits an alert event that includes an error message', (done) => { it('emits an alert event that includes an error message', () => {
tiptapEditor.commands.uploadAttachment({ file: attachmentFile }); tiptapEditor.commands.uploadAttachment({ file: attachmentFile });
eventHub.$on('alert', ({ message, variant }) => { eventHub.$on('alert', ({ message, variant }) => {
expect(variant).toBe(VARIANT_DANGER); expect(variant).toBe(VARIANT_DANGER);
expect(message).toBe('An error occurred while uploading the file. Please try again.'); expect(message).toBe('An error occurred while uploading the file. Please try again.');
done();
}); });
}); });
}); });
......
...@@ -17,10 +17,14 @@ describe('Contributors store actions', () => { ...@@ -17,10 +17,14 @@ describe('Contributors store actions', () => {
mock = new MockAdapter(axios); mock = new MockAdapter(axios);
}); });
it('should commit SET_CHART_DATA with received response', (done) => { afterEach(() => {
mock.restore();
});
it('should commit SET_CHART_DATA with received response', () => {
mock.onGet().reply(200, chartData); mock.onGet().reply(200, chartData);
testAction( return testAction(
actions.fetchChartData, actions.fetchChartData,
{ endpoint }, { endpoint },
{}, {},
...@@ -30,30 +34,22 @@ describe('Contributors store actions', () => { ...@@ -30,30 +34,22 @@ describe('Contributors store actions', () => {
{ type: types.SET_LOADING_STATE, payload: false }, { type: types.SET_LOADING_STATE, payload: false },
], ],
[], [],
() => {
mock.restore();
done();
},
); );
}); });
it('should show flash on API error', (done) => { it('should show flash on API error', async () => {
mock.onGet().reply(400, 'Not Found'); mock.onGet().reply(400, 'Not Found');
testAction( await testAction(
actions.fetchChartData, actions.fetchChartData,
{ endpoint }, { endpoint },
{}, {},
[{ type: types.SET_LOADING_STATE, payload: true }], [{ type: types.SET_LOADING_STATE, payload: true }],
[], [],
() => {
expect(createFlash).toHaveBeenCalledWith({
message: expect.stringMatching('error'),
});
mock.restore();
done();
},
); );
expect(createFlash).toHaveBeenCalledWith({
message: expect.stringMatching('error'),
});
}); });
}); });
}); });
...@@ -14,53 +14,49 @@ import { ...@@ -14,53 +14,49 @@ import {
describe('GCP Cluster Dropdown Store Actions', () => { describe('GCP Cluster Dropdown Store Actions', () => {
describe('setProject', () => { describe('setProject', () => {
it('should set project', (done) => { it('should set project', () => {
testAction( return testAction(
actions.setProject, actions.setProject,
selectedProjectMock, selectedProjectMock,
{ selectedProject: {} }, { selectedProject: {} },
[{ type: 'SET_PROJECT', payload: selectedProjectMock }], [{ type: 'SET_PROJECT', payload: selectedProjectMock }],
[], [],
done,
); );
}); });
}); });
describe('setZone', () => { describe('setZone', () => {
it('should set zone', (done) => { it('should set zone', () => {
testAction( return testAction(
actions.setZone, actions.setZone,
selectedZoneMock, selectedZoneMock,
{ selectedZone: '' }, { selectedZone: '' },
[{ type: 'SET_ZONE', payload: selectedZoneMock }], [{ type: 'SET_ZONE', payload: selectedZoneMock }],
[], [],
done,
); );
}); });
}); });
describe('setMachineType', () => { describe('setMachineType', () => {
it('should set machine type', (done) => { it('should set machine type', () => {
testAction( return testAction(
actions.setMachineType, actions.setMachineType,
selectedMachineTypeMock, selectedMachineTypeMock,
{ selectedMachineType: '' }, { selectedMachineType: '' },
[{ type: 'SET_MACHINE_TYPE', payload: selectedMachineTypeMock }], [{ type: 'SET_MACHINE_TYPE', payload: selectedMachineTypeMock }],
[], [],
done,
); );
}); });
}); });
describe('setIsValidatingProjectBilling', () => { describe('setIsValidatingProjectBilling', () => {
it('should set machine type', (done) => { it('should set machine type', () => {
testAction( return testAction(
actions.setIsValidatingProjectBilling, actions.setIsValidatingProjectBilling,
true, true,
{ isValidatingProjectBilling: null }, { isValidatingProjectBilling: null },
[{ type: 'SET_IS_VALIDATING_PROJECT_BILLING', payload: true }], [{ type: 'SET_IS_VALIDATING_PROJECT_BILLING', payload: true }],
[], [],
done,
); );
}); });
}); });
...@@ -94,8 +90,8 @@ describe('GCP Cluster Dropdown Store Actions', () => { ...@@ -94,8 +90,8 @@ describe('GCP Cluster Dropdown Store Actions', () => {
}); });
describe('validateProjectBilling', () => { describe('validateProjectBilling', () => {
it('checks project billing status from Google API', (done) => { it('checks project billing status from Google API', () => {
testAction( return testAction(
actions.validateProjectBilling, actions.validateProjectBilling,
true, true,
{ {
...@@ -110,7 +106,6 @@ describe('GCP Cluster Dropdown Store Actions', () => { ...@@ -110,7 +106,6 @@ describe('GCP Cluster Dropdown Store Actions', () => {
{ type: 'SET_PROJECT_BILLING_STATUS', payload: true }, { type: 'SET_PROJECT_BILLING_STATUS', payload: true },
], ],
[{ type: 'setIsValidatingProjectBilling', payload: false }], [{ type: 'setIsValidatingProjectBilling', payload: false }],
done,
); );
}); });
}); });
......
...@@ -98,7 +98,7 @@ describe('DiffLineNoteForm', () => { ...@@ -98,7 +98,7 @@ describe('DiffLineNoteForm', () => {
}); });
describe('saveNoteForm', () => { describe('saveNoteForm', () => {
it('should call saveNote action with proper params', (done) => { it('should call saveNote action with proper params', async () => {
const saveDiffDiscussionSpy = jest const saveDiffDiscussionSpy = jest
.spyOn(wrapper.vm, 'saveDiffDiscussion') .spyOn(wrapper.vm, 'saveDiffDiscussion')
.mockReturnValue(Promise.resolve()); .mockReturnValue(Promise.resolve());
...@@ -123,16 +123,11 @@ describe('DiffLineNoteForm', () => { ...@@ -123,16 +123,11 @@ describe('DiffLineNoteForm', () => {
lineRange, lineRange,
}; };
wrapper.vm await wrapper.vm.handleSaveNote('note body');
.handleSaveNote('note body') expect(saveDiffDiscussionSpy).toHaveBeenCalledWith({
.then(() => { note: 'note body',
expect(saveDiffDiscussionSpy).toHaveBeenCalledWith({ formData,
note: 'note body', });
formData,
});
})
.then(done)
.catch(done.fail);
}); });
}); });
}); });
......
This diff is collapsed.
...@@ -23,9 +23,9 @@ describe('Deploy Board', () => { ...@@ -23,9 +23,9 @@ describe('Deploy Board', () => {
}); });
describe('with valid data', () => { describe('with valid data', () => {
beforeEach((done) => { beforeEach(() => {
wrapper = createComponent(); wrapper = createComponent();
nextTick(done); return nextTick();
}); });
it('should render percentage with completion value provided', () => { it('should render percentage with completion value provided', () => {
...@@ -127,14 +127,14 @@ describe('Deploy Board', () => { ...@@ -127,14 +127,14 @@ describe('Deploy Board', () => {
}); });
describe('with empty state', () => { describe('with empty state', () => {
beforeEach((done) => { beforeEach(() => {
wrapper = createComponent({ wrapper = createComponent({
deployBoardData: {}, deployBoardData: {},
isLoading: false, isLoading: false,
isEmpty: true, isEmpty: true,
logsPath, logsPath,
}); });
nextTick(done); return nextTick();
}); });
it('should render the empty state', () => { it('should render the empty state', () => {
...@@ -146,14 +146,14 @@ describe('Deploy Board', () => { ...@@ -146,14 +146,14 @@ describe('Deploy Board', () => {
}); });
describe('with loading state', () => { describe('with loading state', () => {
beforeEach((done) => { beforeEach(() => {
wrapper = createComponent({ wrapper = createComponent({
deployBoardData: {}, deployBoardData: {},
isLoading: true, isLoading: true,
isEmpty: false, isEmpty: false,
logsPath, logsPath,
}); });
nextTick(done); return nextTick();
}); });
it('should render loading spinner', () => { it('should render loading spinner', () => {
...@@ -163,7 +163,7 @@ describe('Deploy Board', () => { ...@@ -163,7 +163,7 @@ describe('Deploy Board', () => {
describe('has legend component', () => { describe('has legend component', () => {
let statuses = []; let statuses = [];
beforeEach((done) => { beforeEach(() => {
wrapper = createComponent({ wrapper = createComponent({
isLoading: false, isLoading: false,
isEmpty: false, isEmpty: false,
...@@ -171,7 +171,7 @@ describe('Deploy Board', () => { ...@@ -171,7 +171,7 @@ describe('Deploy Board', () => {
deployBoardData: deployBoardMockData, deployBoardData: deployBoardMockData,
}); });
({ statuses } = wrapper.vm); ({ statuses } = wrapper.vm);
nextTick(done); return nextTick();
}); });
it('with all the possible statuses', () => { it('with all the possible statuses', () => {
......
...@@ -122,7 +122,7 @@ describe('Environment table', () => { ...@@ -122,7 +122,7 @@ describe('Environment table', () => {
expect(wrapper.find('.deploy-board-icon').exists()).toBe(true); expect(wrapper.find('.deploy-board-icon').exists()).toBe(true);
}); });
it('should toggle deploy board visibility when arrow is clicked', (done) => { it('should toggle deploy board visibility when arrow is clicked', async () => {
const mockItem = { const mockItem = {
name: 'review', name: 'review',
size: 1, size: 1,
...@@ -142,7 +142,6 @@ describe('Environment table', () => { ...@@ -142,7 +142,6 @@ describe('Environment table', () => {
eventHub.$on('toggleDeployBoard', (env) => { eventHub.$on('toggleDeployBoard', (env) => {
expect(env.id).toEqual(mockItem.id); expect(env.id).toEqual(mockItem.id);
done();
}); });
factory({ factory({
...@@ -154,7 +153,7 @@ describe('Environment table', () => { ...@@ -154,7 +153,7 @@ describe('Environment table', () => {
}, },
}); });
wrapper.find('.deploy-board-icon').trigger('click'); await wrapper.find('.deploy-board-icon').trigger('click');
}); });
it('should set the environment to change and weight when a change canary weight event is recevied', async () => { it('should set the environment to change and weight when a change canary weight event is recevied', async () => {
......
...@@ -28,9 +28,9 @@ describe('Sentry common store actions', () => { ...@@ -28,9 +28,9 @@ describe('Sentry common store actions', () => {
const params = { endpoint, redirectUrl, status }; const params = { endpoint, redirectUrl, status };
describe('updateStatus', () => { describe('updateStatus', () => {
it('should handle successful status update', (done) => { it('should handle successful status update', async () => {
mock.onPut().reply(200, {}); mock.onPut().reply(200, {});
testAction( await testAction(
actions.updateStatus, actions.updateStatus,
params, params,
{}, {},
...@@ -41,20 +41,15 @@ describe('Sentry common store actions', () => { ...@@ -41,20 +41,15 @@ describe('Sentry common store actions', () => {
}, },
], ],
[], [],
() => {
done();
expect(visitUrl).toHaveBeenCalledWith(redirectUrl);
},
); );
expect(visitUrl).toHaveBeenCalledWith(redirectUrl);
}); });
it('should handle unsuccessful status update', (done) => { it('should handle unsuccessful status update', async () => {
mock.onPut().reply(400, {}); mock.onPut().reply(400, {});
testAction(actions.updateStatus, params, {}, [], [], () => { await testAction(actions.updateStatus, params, {}, [], []);
expect(visitUrl).not.toHaveBeenCalled(); expect(visitUrl).not.toHaveBeenCalled();
expect(createFlash).toHaveBeenCalledTimes(1); expect(createFlash).toHaveBeenCalledTimes(1);
done();
});
}); });
}); });
......
...@@ -28,10 +28,10 @@ describe('Sentry error details store actions', () => { ...@@ -28,10 +28,10 @@ describe('Sentry error details store actions', () => {
describe('startPollingStacktrace', () => { describe('startPollingStacktrace', () => {
const endpoint = '123/stacktrace'; const endpoint = '123/stacktrace';
it('should commit SET_ERROR with received response', (done) => { it('should commit SET_ERROR with received response', () => {
const payload = { error: [1, 2, 3] }; const payload = { error: [1, 2, 3] };
mockedAdapter.onGet().reply(200, payload); mockedAdapter.onGet().reply(200, payload);
testAction( return testAction(
actions.startPollingStacktrace, actions.startPollingStacktrace,
{ endpoint }, { endpoint },
{}, {},
...@@ -40,37 +40,29 @@ describe('Sentry error details store actions', () => { ...@@ -40,37 +40,29 @@ describe('Sentry error details store actions', () => {
{ type: types.SET_LOADING_STACKTRACE, payload: false }, { type: types.SET_LOADING_STACKTRACE, payload: false },
], ],
[], [],
() => {
done();
},
); );
}); });
it('should show flash on API error', (done) => { it('should show flash on API error', async () => {
mockedAdapter.onGet().reply(400); mockedAdapter.onGet().reply(400);
testAction( await testAction(
actions.startPollingStacktrace, actions.startPollingStacktrace,
{ endpoint }, { endpoint },
{}, {},
[{ type: types.SET_LOADING_STACKTRACE, payload: false }], [{ type: types.SET_LOADING_STACKTRACE, payload: false }],
[], [],
() => {
expect(createFlash).toHaveBeenCalledTimes(1);
done();
},
); );
expect(createFlash).toHaveBeenCalledTimes(1);
}); });
it('should not restart polling when receiving an empty 204 response', (done) => { it('should not restart polling when receiving an empty 204 response', async () => {
mockedRestart = jest.spyOn(Poll.prototype, 'restart'); mockedRestart = jest.spyOn(Poll.prototype, 'restart');
mockedAdapter.onGet().reply(204); mockedAdapter.onGet().reply(204);
testAction(actions.startPollingStacktrace, { endpoint }, {}, [], [], () => { await testAction(actions.startPollingStacktrace, { endpoint }, {}, [], []);
mockedRestart = jest.spyOn(Poll.prototype, 'restart'); mockedRestart = jest.spyOn(Poll.prototype, 'restart');
expect(mockedRestart).toHaveBeenCalledTimes(0); expect(mockedRestart).toHaveBeenCalledTimes(0);
done();
});
}); });
}); });
}); });
...@@ -20,11 +20,11 @@ describe('error tracking actions', () => { ...@@ -20,11 +20,11 @@ describe('error tracking actions', () => {
}); });
describe('startPolling', () => { describe('startPolling', () => {
it('should start polling for data', (done) => { it('should start polling for data', () => {
const payload = { errors: [{ id: 1 }, { id: 2 }] }; const payload = { errors: [{ id: 1 }, { id: 2 }] };
mock.onGet().reply(httpStatusCodes.OK, payload); mock.onGet().reply(httpStatusCodes.OK, payload);
testAction( return testAction(
actions.startPolling, actions.startPolling,
{}, {},
{}, {},
...@@ -35,16 +35,13 @@ describe('error tracking actions', () => { ...@@ -35,16 +35,13 @@ describe('error tracking actions', () => {
{ type: types.SET_LOADING, payload: false }, { type: types.SET_LOADING, payload: false },
], ],
[{ type: 'stopPolling' }], [{ type: 'stopPolling' }],
() => {
done();
},
); );
}); });
it('should show flash on API error', (done) => { it('should show flash on API error', async () => {
mock.onGet().reply(httpStatusCodes.BAD_REQUEST); mock.onGet().reply(httpStatusCodes.BAD_REQUEST);
testAction( await testAction(
actions.startPolling, actions.startPolling,
{}, {},
{}, {},
...@@ -53,11 +50,8 @@ describe('error tracking actions', () => { ...@@ -53,11 +50,8 @@ describe('error tracking actions', () => {
{ type: types.SET_LOADING, payload: false }, { type: types.SET_LOADING, payload: false },
], ],
[], [],
() => {
expect(createFlash).toHaveBeenCalledTimes(1);
done();
},
); );
expect(createFlash).toHaveBeenCalledTimes(1);
}); });
}); });
......
...@@ -27,9 +27,9 @@ describe('error tracking settings actions', () => { ...@@ -27,9 +27,9 @@ describe('error tracking settings actions', () => {
refreshCurrentPage.mockClear(); refreshCurrentPage.mockClear();
}); });
it('should request and transform the project list', (done) => { it('should request and transform the project list', async () => {
mock.onGet(TEST_HOST).reply(() => [200, { projects: projectList }]); mock.onGet(TEST_HOST).reply(() => [200, { projects: projectList }]);
testAction( await testAction(
actions.fetchProjects, actions.fetchProjects,
null, null,
state, state,
...@@ -41,16 +41,13 @@ describe('error tracking settings actions', () => { ...@@ -41,16 +41,13 @@ describe('error tracking settings actions', () => {
payload: projectList.map(convertObjectPropsToCamelCase), payload: projectList.map(convertObjectPropsToCamelCase),
}, },
], ],
() => {
expect(mock.history.get.length).toBe(1);
done();
},
); );
expect(mock.history.get.length).toBe(1);
}); });
it('should handle a server error', (done) => { it('should handle a server error', async () => {
mock.onGet(`${TEST_HOST}.json`).reply(() => [400]); mock.onGet(`${TEST_HOST}.json`).reply(() => [400]);
testAction( await testAction(
actions.fetchProjects, actions.fetchProjects,
null, null,
state, state,
...@@ -61,27 +58,23 @@ describe('error tracking settings actions', () => { ...@@ -61,27 +58,23 @@ describe('error tracking settings actions', () => {
type: 'receiveProjectsError', type: 'receiveProjectsError',
}, },
], ],
() => {
expect(mock.history.get.length).toBe(1);
done();
},
); );
expect(mock.history.get.length).toBe(1);
}); });
it('should request projects correctly', (done) => { it('should request projects correctly', () => {
testAction( return testAction(
actions.requestProjects, actions.requestProjects,
null, null,
state, state,
[{ type: types.SET_PROJECTS_LOADING, payload: true }, { type: types.RESET_CONNECT }], [{ type: types.SET_PROJECTS_LOADING, payload: true }, { type: types.RESET_CONNECT }],
[], [],
done,
); );
}); });
it('should receive projects correctly', (done) => { it('should receive projects correctly', () => {
const testPayload = []; const testPayload = [];
testAction( return testAction(
actions.receiveProjectsSuccess, actions.receiveProjectsSuccess,
testPayload, testPayload,
state, state,
...@@ -91,13 +84,12 @@ describe('error tracking settings actions', () => { ...@@ -91,13 +84,12 @@ describe('error tracking settings actions', () => {
{ type: types.SET_PROJECTS_LOADING, payload: false }, { type: types.SET_PROJECTS_LOADING, payload: false },
], ],
[], [],
done,
); );
}); });
it('should handle errors when receiving projects', (done) => { it('should handle errors when receiving projects', () => {
const testPayload = []; const testPayload = [];
testAction( return testAction(
actions.receiveProjectsError, actions.receiveProjectsError,
testPayload, testPayload,
state, state,
...@@ -107,7 +99,6 @@ describe('error tracking settings actions', () => { ...@@ -107,7 +99,6 @@ describe('error tracking settings actions', () => {
{ type: types.SET_PROJECTS_LOADING, payload: false }, { type: types.SET_PROJECTS_LOADING, payload: false },
], ],
[], [],
done,
); );
}); });
}); });
...@@ -126,18 +117,16 @@ describe('error tracking settings actions', () => { ...@@ -126,18 +117,16 @@ describe('error tracking settings actions', () => {
mock.restore(); mock.restore();
}); });
it('should save the page', (done) => { it('should save the page', async () => {
mock.onPatch(TEST_HOST).reply(200); mock.onPatch(TEST_HOST).reply(200);
testAction(actions.updateSettings, null, state, [], [{ type: 'requestSettings' }], () => { await testAction(actions.updateSettings, null, state, [], [{ type: 'requestSettings' }]);
expect(mock.history.patch.length).toBe(1); expect(mock.history.patch.length).toBe(1);
expect(refreshCurrentPage).toHaveBeenCalled(); expect(refreshCurrentPage).toHaveBeenCalled();
done();
});
}); });
it('should handle a server error', (done) => { it('should handle a server error', async () => {
mock.onPatch(TEST_HOST).reply(400); mock.onPatch(TEST_HOST).reply(400);
testAction( await testAction(
actions.updateSettings, actions.updateSettings,
null, null,
state, state,
...@@ -149,57 +138,50 @@ describe('error tracking settings actions', () => { ...@@ -149,57 +138,50 @@ describe('error tracking settings actions', () => {
payload: new Error('Request failed with status code 400'), payload: new Error('Request failed with status code 400'),
}, },
], ],
() => {
expect(mock.history.patch.length).toBe(1);
done();
},
); );
expect(mock.history.patch.length).toBe(1);
}); });
it('should request to save the page', (done) => { it('should request to save the page', () => {
testAction( return testAction(
actions.requestSettings, actions.requestSettings,
null, null,
state, state,
[{ type: types.UPDATE_SETTINGS_LOADING, payload: true }], [{ type: types.UPDATE_SETTINGS_LOADING, payload: true }],
[], [],
done,
); );
}); });
it('should handle errors when requesting to save the page', (done) => { it('should handle errors when requesting to save the page', () => {
testAction( return testAction(
actions.receiveSettingsError, actions.receiveSettingsError,
{}, {},
state, state,
[{ type: types.UPDATE_SETTINGS_LOADING, payload: false }], [{ type: types.UPDATE_SETTINGS_LOADING, payload: false }],
[], [],
done,
); );
}); });
}); });
describe('generic actions to update the store', () => { describe('generic actions to update the store', () => {
const testData = 'test'; const testData = 'test';
it('should reset the `connect success` flag when updating the api host', (done) => { it('should reset the `connect success` flag when updating the api host', () => {
testAction( return testAction(
actions.updateApiHost, actions.updateApiHost,
testData, testData,
state, state,
[{ type: types.UPDATE_API_HOST, payload: testData }, { type: types.RESET_CONNECT }], [{ type: types.UPDATE_API_HOST, payload: testData }, { type: types.RESET_CONNECT }],
[], [],
done,
); );
}); });
it('should reset the `connect success` flag when updating the token', (done) => { it('should reset the `connect success` flag when updating the token', () => {
testAction( return testAction(
actions.updateToken, actions.updateToken,
testData, testData,
state, state,
[{ type: types.UPDATE_TOKEN, payload: testData }, { type: types.RESET_CONNECT }], [{ type: types.UPDATE_TOKEN, payload: testData }, { type: types.RESET_CONNECT }],
[], [],
done,
); );
}); });
......
...@@ -40,7 +40,7 @@ describe('Feature flags Edit Module actions', () => { ...@@ -40,7 +40,7 @@ describe('Feature flags Edit Module actions', () => {
}); });
describe('success', () => { describe('success', () => {
it('dispatches requestUpdateFeatureFlag and receiveUpdateFeatureFlagSuccess ', (done) => { it('dispatches requestUpdateFeatureFlag and receiveUpdateFeatureFlagSuccess ', () => {
const featureFlag = { const featureFlag = {
name: 'name', name: 'name',
description: 'description', description: 'description',
...@@ -57,7 +57,7 @@ describe('Feature flags Edit Module actions', () => { ...@@ -57,7 +57,7 @@ describe('Feature flags Edit Module actions', () => {
}; };
mock.onPut(mockedState.endpoint, mapStrategiesToRails(featureFlag)).replyOnce(200); mock.onPut(mockedState.endpoint, mapStrategiesToRails(featureFlag)).replyOnce(200);
testAction( return testAction(
updateFeatureFlag, updateFeatureFlag,
featureFlag, featureFlag,
mockedState, mockedState,
...@@ -70,16 +70,15 @@ describe('Feature flags Edit Module actions', () => { ...@@ -70,16 +70,15 @@ describe('Feature flags Edit Module actions', () => {
type: 'receiveUpdateFeatureFlagSuccess', type: 'receiveUpdateFeatureFlagSuccess',
}, },
], ],
done,
); );
}); });
}); });
describe('error', () => { describe('error', () => {
it('dispatches requestUpdateFeatureFlag and receiveUpdateFeatureFlagError ', (done) => { it('dispatches requestUpdateFeatureFlag and receiveUpdateFeatureFlagError ', () => {
mock.onPut(`${TEST_HOST}/endpoint.json`).replyOnce(500, { message: [] }); mock.onPut(`${TEST_HOST}/endpoint.json`).replyOnce(500, { message: [] });
testAction( return testAction(
updateFeatureFlag, updateFeatureFlag,
{ {
name: 'feature_flag', name: 'feature_flag',
...@@ -97,28 +96,26 @@ describe('Feature flags Edit Module actions', () => { ...@@ -97,28 +96,26 @@ describe('Feature flags Edit Module actions', () => {
payload: { message: [] }, payload: { message: [] },
}, },
], ],
done,
); );
}); });
}); });
}); });
describe('requestUpdateFeatureFlag', () => { describe('requestUpdateFeatureFlag', () => {
it('should commit REQUEST_UPDATE_FEATURE_FLAG mutation', (done) => { it('should commit REQUEST_UPDATE_FEATURE_FLAG mutation', () => {
testAction( return testAction(
requestUpdateFeatureFlag, requestUpdateFeatureFlag,
null, null,
mockedState, mockedState,
[{ type: types.REQUEST_UPDATE_FEATURE_FLAG }], [{ type: types.REQUEST_UPDATE_FEATURE_FLAG }],
[], [],
done,
); );
}); });
}); });
describe('receiveUpdateFeatureFlagSuccess', () => { describe('receiveUpdateFeatureFlagSuccess', () => {
it('should commit RECEIVE_UPDATE_FEATURE_FLAG_SUCCESS mutation', (done) => { it('should commit RECEIVE_UPDATE_FEATURE_FLAG_SUCCESS mutation', () => {
testAction( return testAction(
receiveUpdateFeatureFlagSuccess, receiveUpdateFeatureFlagSuccess,
null, null,
mockedState, mockedState,
...@@ -128,20 +125,18 @@ describe('Feature flags Edit Module actions', () => { ...@@ -128,20 +125,18 @@ describe('Feature flags Edit Module actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
describe('receiveUpdateFeatureFlagError', () => { describe('receiveUpdateFeatureFlagError', () => {
it('should commit RECEIVE_UPDATE_FEATURE_FLAG_ERROR mutation', (done) => { it('should commit RECEIVE_UPDATE_FEATURE_FLAG_ERROR mutation', () => {
testAction( return testAction(
receiveUpdateFeatureFlagError, receiveUpdateFeatureFlagError,
'There was an error', 'There was an error',
mockedState, mockedState,
[{ type: types.RECEIVE_UPDATE_FEATURE_FLAG_ERROR, payload: 'There was an error' }], [{ type: types.RECEIVE_UPDATE_FEATURE_FLAG_ERROR, payload: 'There was an error' }],
[], [],
done,
); );
}); });
}); });
...@@ -159,10 +154,10 @@ describe('Feature flags Edit Module actions', () => { ...@@ -159,10 +154,10 @@ describe('Feature flags Edit Module actions', () => {
}); });
describe('success', () => { describe('success', () => {
it('dispatches requestFeatureFlag and receiveFeatureFlagSuccess ', (done) => { it('dispatches requestFeatureFlag and receiveFeatureFlagSuccess ', () => {
mock.onGet(`${TEST_HOST}/endpoint.json`).replyOnce(200, { id: 1 }); mock.onGet(`${TEST_HOST}/endpoint.json`).replyOnce(200, { id: 1 });
testAction( return testAction(
fetchFeatureFlag, fetchFeatureFlag,
{ id: 1 }, { id: 1 },
mockedState, mockedState,
...@@ -176,16 +171,15 @@ describe('Feature flags Edit Module actions', () => { ...@@ -176,16 +171,15 @@ describe('Feature flags Edit Module actions', () => {
payload: { id: 1 }, payload: { id: 1 },
}, },
], ],
done,
); );
}); });
}); });
describe('error', () => { describe('error', () => {
it('dispatches requestFeatureFlag and receiveUpdateFeatureFlagError ', (done) => { it('dispatches requestFeatureFlag and receiveUpdateFeatureFlagError ', () => {
mock.onGet(`${TEST_HOST}/endpoint.json`, {}).replyOnce(500, {}); mock.onGet(`${TEST_HOST}/endpoint.json`, {}).replyOnce(500, {});
testAction( return testAction(
fetchFeatureFlag, fetchFeatureFlag,
null, null,
mockedState, mockedState,
...@@ -198,41 +192,38 @@ describe('Feature flags Edit Module actions', () => { ...@@ -198,41 +192,38 @@ describe('Feature flags Edit Module actions', () => {
type: 'receiveFeatureFlagError', type: 'receiveFeatureFlagError',
}, },
], ],
done,
); );
}); });
}); });
}); });
describe('requestFeatureFlag', () => { describe('requestFeatureFlag', () => {
it('should commit REQUEST_FEATURE_FLAG mutation', (done) => { it('should commit REQUEST_FEATURE_FLAG mutation', () => {
testAction( return testAction(
requestFeatureFlag, requestFeatureFlag,
null, null,
mockedState, mockedState,
[{ type: types.REQUEST_FEATURE_FLAG }], [{ type: types.REQUEST_FEATURE_FLAG }],
[], [],
done,
); );
}); });
}); });
describe('receiveFeatureFlagSuccess', () => { describe('receiveFeatureFlagSuccess', () => {
it('should commit RECEIVE_FEATURE_FLAG_SUCCESS mutation', (done) => { it('should commit RECEIVE_FEATURE_FLAG_SUCCESS mutation', () => {
testAction( return testAction(
receiveFeatureFlagSuccess, receiveFeatureFlagSuccess,
{ id: 1 }, { id: 1 },
mockedState, mockedState,
[{ type: types.RECEIVE_FEATURE_FLAG_SUCCESS, payload: { id: 1 } }], [{ type: types.RECEIVE_FEATURE_FLAG_SUCCESS, payload: { id: 1 } }],
[], [],
done,
); );
}); });
}); });
describe('receiveFeatureFlagError', () => { describe('receiveFeatureFlagError', () => {
it('should commit RECEIVE_FEATURE_FLAG_ERROR mutation', (done) => { it('should commit RECEIVE_FEATURE_FLAG_ERROR mutation', () => {
testAction( return testAction(
receiveFeatureFlagError, receiveFeatureFlagError,
null, null,
mockedState, mockedState,
...@@ -242,20 +233,18 @@ describe('Feature flags Edit Module actions', () => { ...@@ -242,20 +233,18 @@ describe('Feature flags Edit Module actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
describe('toggelActive', () => { describe('toggelActive', () => {
it('should commit TOGGLE_ACTIVE mutation', (done) => { it('should commit TOGGLE_ACTIVE mutation', () => {
testAction( return testAction(
toggleActive, toggleActive,
true, true,
mockedState, mockedState,
[{ type: types.TOGGLE_ACTIVE, payload: true }], [{ type: types.TOGGLE_ACTIVE, payload: true }],
[], [],
done,
); );
}); });
}); });
......
...@@ -32,14 +32,13 @@ describe('Feature flags actions', () => { ...@@ -32,14 +32,13 @@ describe('Feature flags actions', () => {
}); });
describe('setFeatureFlagsOptions', () => { describe('setFeatureFlagsOptions', () => {
it('should commit SET_FEATURE_FLAGS_OPTIONS mutation', (done) => { it('should commit SET_FEATURE_FLAGS_OPTIONS mutation', () => {
testAction( return testAction(
setFeatureFlagsOptions, setFeatureFlagsOptions,
{ page: '1', scope: 'all' }, { page: '1', scope: 'all' },
mockedState, mockedState,
[{ type: types.SET_FEATURE_FLAGS_OPTIONS, payload: { page: '1', scope: 'all' } }], [{ type: types.SET_FEATURE_FLAGS_OPTIONS, payload: { page: '1', scope: 'all' } }],
[], [],
done,
); );
}); });
}); });
...@@ -57,10 +56,10 @@ describe('Feature flags actions', () => { ...@@ -57,10 +56,10 @@ describe('Feature flags actions', () => {
}); });
describe('success', () => { describe('success', () => {
it('dispatches requestFeatureFlags and receiveFeatureFlagsSuccess ', (done) => { it('dispatches requestFeatureFlags and receiveFeatureFlagsSuccess ', () => {
mock.onGet(`${TEST_HOST}/endpoint.json`).replyOnce(200, getRequestData, {}); mock.onGet(`${TEST_HOST}/endpoint.json`).replyOnce(200, getRequestData, {});
testAction( return testAction(
fetchFeatureFlags, fetchFeatureFlags,
null, null,
mockedState, mockedState,
...@@ -74,16 +73,15 @@ describe('Feature flags actions', () => { ...@@ -74,16 +73,15 @@ describe('Feature flags actions', () => {
type: 'receiveFeatureFlagsSuccess', type: 'receiveFeatureFlagsSuccess',
}, },
], ],
done,
); );
}); });
}); });
describe('error', () => { describe('error', () => {
it('dispatches requestFeatureFlags and receiveFeatureFlagsError ', (done) => { it('dispatches requestFeatureFlags and receiveFeatureFlagsError ', () => {
mock.onGet(`${TEST_HOST}/endpoint.json`, {}).replyOnce(500, {}); mock.onGet(`${TEST_HOST}/endpoint.json`, {}).replyOnce(500, {});
testAction( return testAction(
fetchFeatureFlags, fetchFeatureFlags,
null, null,
mockedState, mockedState,
...@@ -96,28 +94,26 @@ describe('Feature flags actions', () => { ...@@ -96,28 +94,26 @@ describe('Feature flags actions', () => {
type: 'receiveFeatureFlagsError', type: 'receiveFeatureFlagsError',
}, },
], ],
done,
); );
}); });
}); });
}); });
describe('requestFeatureFlags', () => { describe('requestFeatureFlags', () => {
it('should commit RECEIVE_FEATURE_FLAGS_SUCCESS mutation', (done) => { it('should commit RECEIVE_FEATURE_FLAGS_SUCCESS mutation', () => {
testAction( return testAction(
requestFeatureFlags, requestFeatureFlags,
null, null,
mockedState, mockedState,
[{ type: types.REQUEST_FEATURE_FLAGS }], [{ type: types.REQUEST_FEATURE_FLAGS }],
[], [],
done,
); );
}); });
}); });
describe('receiveFeatureFlagsSuccess', () => { describe('receiveFeatureFlagsSuccess', () => {
it('should commit RECEIVE_FEATURE_FLAGS_SUCCESS mutation', (done) => { it('should commit RECEIVE_FEATURE_FLAGS_SUCCESS mutation', () => {
testAction( return testAction(
receiveFeatureFlagsSuccess, receiveFeatureFlagsSuccess,
{ data: getRequestData, headers: {} }, { data: getRequestData, headers: {} },
mockedState, mockedState,
...@@ -128,20 +124,18 @@ describe('Feature flags actions', () => { ...@@ -128,20 +124,18 @@ describe('Feature flags actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
describe('receiveFeatureFlagsError', () => { describe('receiveFeatureFlagsError', () => {
it('should commit RECEIVE_FEATURE_FLAGS_ERROR mutation', (done) => { it('should commit RECEIVE_FEATURE_FLAGS_ERROR mutation', () => {
testAction( return testAction(
receiveFeatureFlagsError, receiveFeatureFlagsError,
null, null,
mockedState, mockedState,
[{ type: types.RECEIVE_FEATURE_FLAGS_ERROR }], [{ type: types.RECEIVE_FEATURE_FLAGS_ERROR }],
[], [],
done,
); );
}); });
}); });
...@@ -159,10 +153,10 @@ describe('Feature flags actions', () => { ...@@ -159,10 +153,10 @@ describe('Feature flags actions', () => {
}); });
describe('success', () => { describe('success', () => {
it('dispatches requestRotateInstanceId and receiveRotateInstanceIdSuccess ', (done) => { it('dispatches requestRotateInstanceId and receiveRotateInstanceIdSuccess ', () => {
mock.onPost(`${TEST_HOST}/endpoint.json`).replyOnce(200, rotateData, {}); mock.onPost(`${TEST_HOST}/endpoint.json`).replyOnce(200, rotateData, {});
testAction( return testAction(
rotateInstanceId, rotateInstanceId,
null, null,
mockedState, mockedState,
...@@ -176,16 +170,15 @@ describe('Feature flags actions', () => { ...@@ -176,16 +170,15 @@ describe('Feature flags actions', () => {
type: 'receiveRotateInstanceIdSuccess', type: 'receiveRotateInstanceIdSuccess',
}, },
], ],
done,
); );
}); });
}); });
describe('error', () => { describe('error', () => {
it('dispatches requestRotateInstanceId and receiveRotateInstanceIdError ', (done) => { it('dispatches requestRotateInstanceId and receiveRotateInstanceIdError ', () => {
mock.onGet(`${TEST_HOST}/endpoint.json`, {}).replyOnce(500, {}); mock.onGet(`${TEST_HOST}/endpoint.json`, {}).replyOnce(500, {});
testAction( return testAction(
rotateInstanceId, rotateInstanceId,
null, null,
mockedState, mockedState,
...@@ -198,28 +191,26 @@ describe('Feature flags actions', () => { ...@@ -198,28 +191,26 @@ describe('Feature flags actions', () => {
type: 'receiveRotateInstanceIdError', type: 'receiveRotateInstanceIdError',
}, },
], ],
done,
); );
}); });
}); });
}); });
describe('requestRotateInstanceId', () => { describe('requestRotateInstanceId', () => {
it('should commit REQUEST_ROTATE_INSTANCE_ID mutation', (done) => { it('should commit REQUEST_ROTATE_INSTANCE_ID mutation', () => {
testAction( return testAction(
requestRotateInstanceId, requestRotateInstanceId,
null, null,
mockedState, mockedState,
[{ type: types.REQUEST_ROTATE_INSTANCE_ID }], [{ type: types.REQUEST_ROTATE_INSTANCE_ID }],
[], [],
done,
); );
}); });
}); });
describe('receiveRotateInstanceIdSuccess', () => { describe('receiveRotateInstanceIdSuccess', () => {
it('should commit RECEIVE_ROTATE_INSTANCE_ID_SUCCESS mutation', (done) => { it('should commit RECEIVE_ROTATE_INSTANCE_ID_SUCCESS mutation', () => {
testAction( return testAction(
receiveRotateInstanceIdSuccess, receiveRotateInstanceIdSuccess,
{ data: rotateData, headers: {} }, { data: rotateData, headers: {} },
mockedState, mockedState,
...@@ -230,20 +221,18 @@ describe('Feature flags actions', () => { ...@@ -230,20 +221,18 @@ describe('Feature flags actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
describe('receiveRotateInstanceIdError', () => { describe('receiveRotateInstanceIdError', () => {
it('should commit RECEIVE_ROTATE_INSTANCE_ID_ERROR mutation', (done) => { it('should commit RECEIVE_ROTATE_INSTANCE_ID_ERROR mutation', () => {
testAction( return testAction(
receiveRotateInstanceIdError, receiveRotateInstanceIdError,
null, null,
mockedState, mockedState,
[{ type: types.RECEIVE_ROTATE_INSTANCE_ID_ERROR }], [{ type: types.RECEIVE_ROTATE_INSTANCE_ID_ERROR }],
[], [],
done,
); );
}); });
}); });
...@@ -262,10 +251,10 @@ describe('Feature flags actions', () => { ...@@ -262,10 +251,10 @@ describe('Feature flags actions', () => {
mock.restore(); mock.restore();
}); });
describe('success', () => { describe('success', () => {
it('dispatches updateFeatureFlag and receiveUpdateFeatureFlagSuccess', (done) => { it('dispatches updateFeatureFlag and receiveUpdateFeatureFlagSuccess', () => {
mock.onPut(featureFlag.update_path).replyOnce(200, featureFlag, {}); mock.onPut(featureFlag.update_path).replyOnce(200, featureFlag, {});
testAction( return testAction(
toggleFeatureFlag, toggleFeatureFlag,
featureFlag, featureFlag,
mockedState, mockedState,
...@@ -280,15 +269,15 @@ describe('Feature flags actions', () => { ...@@ -280,15 +269,15 @@ describe('Feature flags actions', () => {
type: 'receiveUpdateFeatureFlagSuccess', type: 'receiveUpdateFeatureFlagSuccess',
}, },
], ],
done,
); );
}); });
}); });
describe('error', () => { describe('error', () => {
it('dispatches updateFeatureFlag and receiveUpdateFeatureFlagSuccess', (done) => { it('dispatches updateFeatureFlag and receiveUpdateFeatureFlagSuccess', () => {
mock.onPut(featureFlag.update_path).replyOnce(500); mock.onPut(featureFlag.update_path).replyOnce(500);
testAction( return testAction(
toggleFeatureFlag, toggleFeatureFlag,
featureFlag, featureFlag,
mockedState, mockedState,
...@@ -303,7 +292,6 @@ describe('Feature flags actions', () => { ...@@ -303,7 +292,6 @@ describe('Feature flags actions', () => {
type: 'receiveUpdateFeatureFlagError', type: 'receiveUpdateFeatureFlagError',
}, },
], ],
done,
); );
}); });
}); });
...@@ -315,8 +303,8 @@ describe('Feature flags actions', () => { ...@@ -315,8 +303,8 @@ describe('Feature flags actions', () => {
})); }));
}); });
it('commits UPDATE_FEATURE_FLAG with the given flag', (done) => { it('commits UPDATE_FEATURE_FLAG with the given flag', () => {
testAction( return testAction(
updateFeatureFlag, updateFeatureFlag,
featureFlag, featureFlag,
mockedState, mockedState,
...@@ -327,7 +315,6 @@ describe('Feature flags actions', () => { ...@@ -327,7 +315,6 @@ describe('Feature flags actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
...@@ -338,8 +325,8 @@ describe('Feature flags actions', () => { ...@@ -338,8 +325,8 @@ describe('Feature flags actions', () => {
})); }));
}); });
it('commits RECEIVE_UPDATE_FEATURE_FLAG_SUCCESS with the given flag', (done) => { it('commits RECEIVE_UPDATE_FEATURE_FLAG_SUCCESS with the given flag', () => {
testAction( return testAction(
receiveUpdateFeatureFlagSuccess, receiveUpdateFeatureFlagSuccess,
featureFlag, featureFlag,
mockedState, mockedState,
...@@ -350,7 +337,6 @@ describe('Feature flags actions', () => { ...@@ -350,7 +337,6 @@ describe('Feature flags actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
...@@ -361,8 +347,8 @@ describe('Feature flags actions', () => { ...@@ -361,8 +347,8 @@ describe('Feature flags actions', () => {
})); }));
}); });
it('commits RECEIVE_UPDATE_FEATURE_FLAG_ERROR with the given flag id', (done) => { it('commits RECEIVE_UPDATE_FEATURE_FLAG_ERROR with the given flag id', () => {
testAction( return testAction(
receiveUpdateFeatureFlagError, receiveUpdateFeatureFlagError,
featureFlag.id, featureFlag.id,
mockedState, mockedState,
...@@ -373,22 +359,20 @@ describe('Feature flags actions', () => { ...@@ -373,22 +359,20 @@ describe('Feature flags actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
describe('clearAlert', () => { describe('clearAlert', () => {
it('should commit RECEIVE_CLEAR_ALERT', (done) => { it('should commit RECEIVE_CLEAR_ALERT', () => {
const alertIndex = 3; const alertIndex = 3;
testAction( return testAction(
clearAlert, clearAlert,
alertIndex, alertIndex,
mockedState, mockedState,
[{ type: 'RECEIVE_CLEAR_ALERT', payload: alertIndex }], [{ type: 'RECEIVE_CLEAR_ALERT', payload: alertIndex }],
[], [],
done,
); );
}); });
}); });
......
...@@ -33,7 +33,7 @@ describe('Feature flags New Module Actions', () => { ...@@ -33,7 +33,7 @@ describe('Feature flags New Module Actions', () => {
}); });
describe('success', () => { describe('success', () => {
it('dispatches requestCreateFeatureFlag and receiveCreateFeatureFlagSuccess ', (done) => { it('dispatches requestCreateFeatureFlag and receiveCreateFeatureFlagSuccess ', () => {
const actionParams = { const actionParams = {
name: 'name', name: 'name',
description: 'description', description: 'description',
...@@ -50,7 +50,7 @@ describe('Feature flags New Module Actions', () => { ...@@ -50,7 +50,7 @@ describe('Feature flags New Module Actions', () => {
}; };
mock.onPost(mockedState.endpoint, mapStrategiesToRails(actionParams)).replyOnce(200); mock.onPost(mockedState.endpoint, mapStrategiesToRails(actionParams)).replyOnce(200);
testAction( return testAction(
createFeatureFlag, createFeatureFlag,
actionParams, actionParams,
mockedState, mockedState,
...@@ -63,13 +63,12 @@ describe('Feature flags New Module Actions', () => { ...@@ -63,13 +63,12 @@ describe('Feature flags New Module Actions', () => {
type: 'receiveCreateFeatureFlagSuccess', type: 'receiveCreateFeatureFlagSuccess',
}, },
], ],
done,
); );
}); });
}); });
describe('error', () => { describe('error', () => {
it('dispatches requestCreateFeatureFlag and receiveCreateFeatureFlagError ', (done) => { it('dispatches requestCreateFeatureFlag and receiveCreateFeatureFlagError ', () => {
const actionParams = { const actionParams = {
name: 'name', name: 'name',
description: 'description', description: 'description',
...@@ -88,7 +87,7 @@ describe('Feature flags New Module Actions', () => { ...@@ -88,7 +87,7 @@ describe('Feature flags New Module Actions', () => {
.onPost(mockedState.endpoint, mapStrategiesToRails(actionParams)) .onPost(mockedState.endpoint, mapStrategiesToRails(actionParams))
.replyOnce(500, { message: [] }); .replyOnce(500, { message: [] });
testAction( return testAction(
createFeatureFlag, createFeatureFlag,
actionParams, actionParams,
mockedState, mockedState,
...@@ -102,28 +101,26 @@ describe('Feature flags New Module Actions', () => { ...@@ -102,28 +101,26 @@ describe('Feature flags New Module Actions', () => {
payload: { message: [] }, payload: { message: [] },
}, },
], ],
done,
); );
}); });
}); });
}); });
describe('requestCreateFeatureFlag', () => { describe('requestCreateFeatureFlag', () => {
it('should commit REQUEST_CREATE_FEATURE_FLAG mutation', (done) => { it('should commit REQUEST_CREATE_FEATURE_FLAG mutation', () => {
testAction( return testAction(
requestCreateFeatureFlag, requestCreateFeatureFlag,
null, null,
mockedState, mockedState,
[{ type: types.REQUEST_CREATE_FEATURE_FLAG }], [{ type: types.REQUEST_CREATE_FEATURE_FLAG }],
[], [],
done,
); );
}); });
}); });
describe('receiveCreateFeatureFlagSuccess', () => { describe('receiveCreateFeatureFlagSuccess', () => {
it('should commit RECEIVE_CREATE_FEATURE_FLAG_SUCCESS mutation', (done) => { it('should commit RECEIVE_CREATE_FEATURE_FLAG_SUCCESS mutation', () => {
testAction( return testAction(
receiveCreateFeatureFlagSuccess, receiveCreateFeatureFlagSuccess,
null, null,
mockedState, mockedState,
...@@ -133,20 +130,18 @@ describe('Feature flags New Module Actions', () => { ...@@ -133,20 +130,18 @@ describe('Feature flags New Module Actions', () => {
}, },
], ],
[], [],
done,
); );
}); });
}); });
describe('receiveCreateFeatureFlagError', () => { describe('receiveCreateFeatureFlagError', () => {
it('should commit RECEIVE_CREATE_FEATURE_FLAG_ERROR mutation', (done) => { it('should commit RECEIVE_CREATE_FEATURE_FLAG_ERROR mutation', () => {
testAction( return testAction(
receiveCreateFeatureFlagError, receiveCreateFeatureFlagError,
'There was an error', 'There was an error',
mockedState, mockedState,
[{ type: types.RECEIVE_CREATE_FEATURE_FLAG_ERROR, payload: 'There was an error' }], [{ type: types.RECEIVE_CREATE_FEATURE_FLAG_ERROR, payload: 'There was an error' }],
[], [],
done,
); );
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment