forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-13 19:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrated visits-loading actions to payload actions

Browse Source
This commit is contained in:
Alejandro Celaya
2022-11-12 10:33:52 +01:00
parent a6ed0c811d
commit a3cc3d5fc2
15 changed files with 136 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/visits/reducers/domainVisits.test.ts
View File

@@ -61,10 +61,10 @@ describe('domainVisitsReducer', () => {
it('return visits on GET_DOMAIN_VISITS', () => {
const actionVisits = [{}, {}];
const state = reducer(
buildState({ loading: true, error: false }),
{ type: GET_DOMAIN_VISITS, visits: actionVisits } as any,
);
const state = reducer(buildState({ loading: true, error: false }), {
type: GET_DOMAIN_VISITS,
payload: { visits: actionVisits },
} as any);
const { loading, error, visits } = state;
expect(loading).toEqual(false);
@@ -201,7 +201,10 @@ describe('domainVisitsReducer', () => {
expect(dispatchMock).toHaveBeenCalledTimes(2);
expect(dispatchMock).toHaveBeenNthCalledWith(1, { type: GET_DOMAIN_VISITS_START });
expect(dispatchMock).toHaveBeenNthCalledWith(2, { type: GET_DOMAIN_VISITS, visits, domain, query: query ?? {} });
expect(dispatchMock).toHaveBeenNthCalledWith(2, {
type: GET_DOMAIN_VISITS,
payload: { visits, domain, query: query ?? {} },
});
expect(shlinkApiClient.getDomainVisits).toHaveBeenCalledTimes(1);
});

13
test/visits/reducers/nonOrphanVisits.test.ts
View File

@@ -59,10 +59,10 @@ describe('nonOrphanVisitsReducer', () => {
it('return visits on GET_NON_ORPHAN_VISITS', () => {
const actionVisits = [{}, {}];
const state = reducer(
buildState({ loading: true, error: false }),
{ type: GET_NON_ORPHAN_VISITS, visits: actionVisits } as any,
);
const state = reducer(buildState({ loading: true, error: false }), {
type: GET_NON_ORPHAN_VISITS,
payload: { visits: actionVisits },
} as any);
const { loading, error, visits } = state;
expect(loading).toEqual(false);
@@ -173,7 +173,10 @@ describe('nonOrphanVisitsReducer', () => {
expect(dispatchMock).toHaveBeenCalledTimes(2);
expect(dispatchMock).toHaveBeenNthCalledWith(1, { type: GET_NON_ORPHAN_VISITS_START });
expect(dispatchMock).toHaveBeenNthCalledWith(2, { type: GET_NON_ORPHAN_VISITS, visits, query: query ?? {} });
expect(dispatchMock).toHaveBeenNthCalledWith(2, {
type: GET_NON_ORPHAN_VISITS,
payload: { visits, query: query ?? {} },
});
expect(ShlinkApiClient.getNonOrphanVisits).toHaveBeenCalledTimes(1);
});

13
test/visits/reducers/orphanVisits.test.ts
View File

@@ -59,10 +59,10 @@ describe('orphanVisitsReducer', () => {
it('return visits on GET_ORPHAN_VISITS', () => {
const actionVisits = [{}, {}];
const state = reducer(
buildState({ loading: true, error: false }),
{ type: GET_ORPHAN_VISITS, visits: actionVisits } as any,
);
const state = reducer(buildState({ loading: true, error: false }), {
type: GET_ORPHAN_VISITS,
payload: { visits: actionVisits },
} as any);
const { loading, error, visits } = state;
expect(loading).toEqual(false);
@@ -173,7 +173,10 @@ describe('orphanVisitsReducer', () => {
expect(dispatchMock).toHaveBeenCalledTimes(2);
expect(dispatchMock).toHaveBeenNthCalledWith(1, { type: GET_ORPHAN_VISITS_START });
expect(dispatchMock).toHaveBeenNthCalledWith(2, { type: GET_ORPHAN_VISITS, visits, query: query ?? {} });
expect(dispatchMock).toHaveBeenNthCalledWith(2, {
type: GET_ORPHAN_VISITS,
payload: { visits, query: query ?? {} },
});
expect(ShlinkApiClient.getOrphanVisits).toHaveBeenCalledTimes(1);
});

20
test/visits/reducers/shortUrlVisits.test.ts
View File

@@ -59,10 +59,10 @@ describe('shortUrlVisitsReducer', () => {
it('return visits on GET_SHORT_URL_VISITS', () => {
const actionVisits = [{}, {}];
const state = reducer(
buildState({ loading: true, error: false }),
{ type: GET_SHORT_URL_VISITS, visits: actionVisits } as any,
);
const state = reducer(buildState({ loading: true, error: false }), {
type: GET_SHORT_URL_VISITS,
payload: { visits: actionVisits },
} as any);
const { loading, error, visits } = state;
expect(loading).toEqual(false);
@@ -195,10 +195,10 @@ describe('shortUrlVisitsReducer', () => {
expect(dispatchMock).toHaveBeenCalledTimes(2);
expect(dispatchMock).toHaveBeenNthCalledWith(1, { type: GET_SHORT_URL_VISITS_START });
expect(dispatchMock).toHaveBeenNthCalledWith(
2,
{ type: GET_SHORT_URL_VISITS, visits, shortCode, domain, query: query ?? {} },
);
expect(dispatchMock).toHaveBeenNthCalledWith(2, {
type: GET_SHORT_URL_VISITS,
payload: { visits, shortCode, domain, query: query ?? {} },
});
expect(ShlinkApiClient.getShortUrlVisits).toHaveBeenCalledTimes(1);
});
@@ -218,7 +218,9 @@ describe('shortUrlVisitsReducer', () => {
expect(ShlinkApiClient.getShortUrlVisits).toHaveBeenCalledTimes(expectedRequests);
expect(dispatchMock).toHaveBeenNthCalledWith(3, expect.objectContaining({
visits: [...visitsMocks, ...visitsMocks, ...visitsMocks],
payload: expect.objectContaining({
visits: [...visitsMocks, ...visitsMocks, ...visitsMocks],
}),
}));
});

19
test/visits/reducers/tagVisits.test.ts
View File

@@ -59,10 +59,10 @@ describe('tagVisitsReducer', () => {
it('return visits on GET_TAG_VISITS', () => {
const actionVisits = [{}, {}];
const state = reducer(
buildState({ loading: true, error: false }),
{ type: GET_TAG_VISITS, visits: actionVisits } as any,
);
const state = reducer(buildState({ loading: true, error: false }), {
type: GET_TAG_VISITS,
payload: { visits: actionVisits },
} as any);
const { loading, error, visits } = state;
expect(loading).toEqual(false);
@@ -165,7 +165,7 @@ describe('tagVisitsReducer', () => {
it('dispatches start and error when promise is rejected', async () => {
const shlinkApiClient = buildApiClientMock(Promise.reject(new Error()));
await getTagVisits(() => shlinkApiClient)('foo')(dispatchMock, getState);
await getTagVisits(() => shlinkApiClient)({ tag })(dispatchMock, getState);
expect(dispatchMock).toHaveBeenCalledTimes(2);
expect(dispatchMock).toHaveBeenNthCalledWith(1, { type: GET_TAG_VISITS_START });
@@ -187,11 +187,14 @@ describe('tagVisitsReducer', () => {
},
}));
await getTagVisits(() => shlinkApiClient)(tag, query)(dispatchMock, getState);
await getTagVisits(() => shlinkApiClient)({ tag, query })(dispatchMock, getState);
expect(dispatchMock).toHaveBeenCalledTimes(2);
expect(dispatchMock).toHaveBeenNthCalledWith(1, { type: GET_TAG_VISITS_START });
expect(dispatchMock).toHaveBeenNthCalledWith(2, { type: GET_TAG_VISITS, visits, tag, query: query ?? {} });
expect(dispatchMock).toHaveBeenNthCalledWith(2, {
type: GET_TAG_VISITS,
payload: { visits, tag, query: query ?? {} },
});
expect(shlinkApiClient.getTagVisits).toHaveBeenCalledTimes(1);
});
@@ -219,7 +222,7 @@ describe('tagVisitsReducer', () => {
.mockResolvedValueOnce(buildVisitsResult(lastVisits));
const ShlinkApiClient = Mock.of<ShlinkApiClient>({ getTagVisits: getShlinkTagVisits });
await getTagVisits(() => ShlinkApiClient)(tag, {}, true)(dispatchMock, getState);
await getTagVisits(() => ShlinkApiClient)({ tag, doIntervalFallback: true })(dispatchMock, getState);
expect(dispatchMock).toHaveBeenCalledTimes(2);
expect(dispatchMock).toHaveBeenNthCalledWith(1, { type: GET_TAG_VISITS_START });