diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js index fb1bfef92..b8616af3e 100644 --- a/app/javascript/dashboard/store/modules/reports.js +++ b/app/javascript/dashboard/store/modules/reports.js @@ -7,7 +7,7 @@ import { REPORTS_EVENTS } from '../../helper/AnalyticsHelper/events'; import { reconcileHeatmapData, clampDataBetweenTimeline, -} from 'helpers/ReportsDataHelper'; +} from 'shared/helpers/ReportsDataHelper'; const state = { fetchingStatus: false, diff --git a/app/javascript/dashboard/store/modules/specs/inboxes/actions.spec.js b/app/javascript/dashboard/store/modules/specs/inboxes/actions.spec.js index 381c785e4..fb8ce3abf 100644 --- a/app/javascript/dashboard/store/modules/specs/inboxes/actions.spec.js +++ b/app/javascript/dashboard/store/modules/specs/inboxes/actions.spec.js @@ -10,7 +10,19 @@ jest.mock('axios'); describe('#actions', () => { describe('#get', () => { it('sends correct actions if API is success', async () => { - axios.get.mockResolvedValue({ data: { payload: inboxList } }); + const mockedGet = jest.fn(url => { + if (url === '/api/v1/inboxes') { + return Promise.resolve({ data: { payload: inboxList } }); + } + if (url === '/api/v1/accounts//cache_keys') { + return Promise.resolve({ data: { cache_keys: { inboxes: 0 } } }); + } + // Return default value or throw an error for unexpected requests + return Promise.reject(new Error('Unexpected request: ' + url)); + }); + + axios.get = mockedGet; + await actions.get({ commit }); expect(commit.mock.calls).toEqual([ [types.default.SET_INBOXES_UI_FLAG, { isFetching: true }], diff --git a/app/javascript/dashboard/store/modules/specs/labels/actions.spec.js b/app/javascript/dashboard/store/modules/specs/labels/actions.spec.js index d6d7e63a9..0918949ef 100644 --- a/app/javascript/dashboard/store/modules/specs/labels/actions.spec.js +++ b/app/javascript/dashboard/store/modules/specs/labels/actions.spec.js @@ -10,7 +10,19 @@ jest.mock('axios'); describe('#actions', () => { describe('#get', () => { it('sends correct actions if API is success', async () => { - axios.get.mockResolvedValue({ data: { payload: labelsList } }); + const mockedGet = jest.fn(url => { + if (url === '/api/v1/labels') { + return Promise.resolve({ data: { payload: labelsList } }); + } + if (url === '/api/v1/accounts//cache_keys') { + return Promise.resolve({ data: { cache_keys: { labels: 0 } } }); + } + // Return default value or throw an error for unexpected requests + return Promise.reject(new Error('Unexpected request: ' + url)); + }); + + axios.get = mockedGet; + await actions.get({ commit }); expect(commit.mock.calls).toEqual([ [types.default.SET_LABEL_UI_FLAG, { isFetching: true }], diff --git a/app/javascript/dashboard/store/modules/specs/teams/actions.spec.js b/app/javascript/dashboard/store/modules/specs/teams/actions.spec.js index 8c11fb3a7..909f54e6f 100644 --- a/app/javascript/dashboard/store/modules/specs/teams/actions.spec.js +++ b/app/javascript/dashboard/store/modules/specs/teams/actions.spec.js @@ -17,7 +17,19 @@ jest.mock('axios'); describe('#actions', () => { describe('#get', () => { it('sends correct actions if API is success', async () => { - axios.get.mockResolvedValue({ data: teamsList[1] }); + const mockedGet = jest.fn(url => { + if (url === '/api/v1/teams') { + return Promise.resolve({ data: teamsList[1] }); + } + if (url === '/api/v1/accounts//cache_keys') { + return Promise.resolve({ data: { cache_keys: { teams: 0 } } }); + } + // Return default value or throw an error for unexpected requests + return Promise.reject(new Error('Unexpected request: ' + url)); + }); + + axios.get = mockedGet; + await actions.get({ commit }); expect(commit.mock.calls).toEqual([ [SET_TEAM_UI_FLAG, { isFetching: true }],