parent
ba4dc01ea8
commit
7469b58eaf
|
@ -31,10 +31,15 @@ export const openMergeRequest = ({ commit, dispatch }, { projectPath, id }) => {
|
|||
commit(rootTypes.CLEAR_PROJECTS, null, { root: true });
|
||||
commit(rootTypes.SET_CURRENT_MERGE_REQUEST, `${id}`, { root: true });
|
||||
commit(rootTypes.RESET_OPEN_FILES, null, { root: true });
|
||||
dispatch('pipelines/stopPipelinePolling', null, { root: true });
|
||||
dispatch('pipelines/clearEtagPoll', null, { root: true });
|
||||
dispatch('pipelines/resetLatestPipeline', null, { root: true });
|
||||
dispatch('setCurrentBranchId', '', { root: true });
|
||||
dispatch('pipelines/stopPipelinePolling', null, { root: true })
|
||||
.then(() => {
|
||||
dispatch('pipelines/clearEtagPoll', null, { root: true });
|
||||
})
|
||||
.catch(e => {
|
||||
throw e;
|
||||
});
|
||||
|
||||
router.push(`/project/${projectPath}/merge_requests/${id}`);
|
||||
};
|
||||
|
|
|
@ -12,8 +12,12 @@ let eTagPoll;
|
|||
export const clearEtagPoll = () => {
|
||||
eTagPoll = null;
|
||||
};
|
||||
export const stopPipelinePolling = () => eTagPoll && eTagPoll.stop();
|
||||
export const restartPipelinePolling = () => eTagPoll && eTagPoll.restart();
|
||||
export const stopPipelinePolling = () => {
|
||||
if (eTagPoll) eTagPoll.stop();
|
||||
};
|
||||
export const restartPipelinePolling = () => {
|
||||
if (eTagPoll) eTagPoll.restart();
|
||||
};
|
||||
|
||||
export const requestLatestPipeline = ({ commit }) => commit(types.REQUEST_LATEST_PIPELINE);
|
||||
export const receiveLatestPipelineError = ({ commit, dispatch }) => {
|
||||
|
@ -51,9 +55,9 @@ export const fetchLatestPipeline = ({ dispatch, rootGetters }) => {
|
|||
|
||||
Visibility.change(() => {
|
||||
if (!Visibility.hidden()) {
|
||||
eTagPoll.restart();
|
||||
dispatch('restartPipelinePolling');
|
||||
} else {
|
||||
eTagPoll.stop();
|
||||
dispatch('stopPipelinePolling');
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
|
@ -45,12 +45,15 @@ describe('IDE pipelines list', () => {
|
|||
setTimeout(done);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vm.$store.dispatch('pipelines/stopPipelinePolling');
|
||||
vm.$store.dispatch('pipelines/clearEtagPoll');
|
||||
|
||||
afterEach(done => {
|
||||
vm.$destroy();
|
||||
mock.restore();
|
||||
|
||||
vm.$store
|
||||
.dispatch('pipelines/stopPipelinePolling')
|
||||
.then(() => vm.$store.dispatch('pipelines/clearEtagPoll'))
|
||||
.then(done)
|
||||
.catch(done.fail);
|
||||
});
|
||||
|
||||
it('renders pipeline data', () => {
|
||||
|
|
Loading…
Reference in New Issue