Skip to content

Show tests passing without leaks by commenting out axios-cache-adapter functionality #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahayes91 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Show tests passing without leaks by commenting out axios-cache-adapter functionality #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc336f9
Comment out all the axios-cache-adaptor functionality and run `yarn w…
Sep 8, 2020
fb104de
Update axiosHelpers.test.js
Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/libs/core-api/src/axiosHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from 'axios';
import axiosRetry from 'axios-retry';
import { setupCache } from 'axios-cache-adapter';
// import { setupCache } from 'axios-cache-adapter';
import backoff from './utils/backoff';

// Exported only for unit test coverage
Expand All @@ -10,12 +10,12 @@ export const customCacheInvalidate = async (config, request) => {
}
};

const cache = setupCache({
// 15 minute cache
maxAge: 15 * 60 * 1000,
// Invalidate only when a specific option is passed through config
invalidate: customCacheInvalidate,
});
// const cache = setupCache({
// // 15 minute cache
// maxAge: 15 * 60 * 1000,
// // Invalidate only when a specific option is passed through config
// invalidate: customCacheInvalidate,
// });

export const getHeaderWithoutAuth = (optionalHeaders = {}) => {
return {
Expand Down Expand Up @@ -46,7 +46,7 @@ export const createAxiosCancelable = ({
const canceler = axios.CancelToken.source();
const auth = getHeaderWithoutAuth();
if (withCache) {
auth.adapter = cache.adapter;
// auth.adapter = cache.adapter;
}
const client = axios.create(auth);
axiosRetry(client, backoff(min, max));
Expand Down
106 changes: 53 additions & 53 deletions packages/libs/core-api/src/axiosHelpers.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,58 +119,58 @@ describe('axiosHelpers', () => {

expect(backoff).toHaveBeenCalledWith(expectedMin, expectedMax);
});
describe('cache', () => {
beforeEach(() => {
jest.clearAllMocks();
});

it('when withCache is true, axios create is called with adapter', () => {
createAxiosCancelable({ withCache: true });

expect(axios.create).toBeCalledWith(
expect.objectContaining({
adapter: expect.any(Function),
}),
);
});

it('when withCache is false, axios create is called without adapter', () => {
createAxiosCancelable({ withCache: false });

expect(axios.create).not.toBeCalledWith(
expect.objectContaining({
adapter: expect.any(Function),
}),
);
});

it('when withCache not specified, axios create is called without adapter', () => {
createAxiosCancelable();

expect(axios.create).not.toBeCalledWith(
expect.objectContaining({
adapter: expect.any(Function),
}),
);
});

it('when invalidate function on cache is called, it looks for clearCacheEntry in the request before invalidating the cache', async () => {
const mockRemoveItem = jest.fn();
const mockUuid = 'mockUuid';
const mockConfig = {
store: {
removeItem: mockRemoveItem,
},
uuid: mockUuid,
};

customCacheInvalidate(mockConfig, {});
expect(mockRemoveItem).not.toHaveBeenCalled();
const mockRequest = { clearCacheEntry: true };

customCacheInvalidate(mockConfig, mockRequest);
expect(mockRemoveItem).toHaveBeenCalledWith(mockUuid);
});
});
// describe('cache', () => {
// beforeEach(() => {
// jest.clearAllMocks();
// });

// it('when withCache is true, axios create is called with adapter', () => {
// createAxiosCancelable({ withCache: true });

// expect(axios.create).toBeCalledWith(
// expect.objectContaining({
// adapter: expect.any(Function),
// }),
// );
// });

// it('when withCache is false, axios create is called without adapter', () => {
// createAxiosCancelable({ withCache: false });

// expect(axios.create).not.toBeCalledWith(
// expect.objectContaining({
// adapter: expect.any(Function),
// }),
// );
// });

// it('when withCache not specified, axios create is called without adapter', () => {
// createAxiosCancelable();

// expect(axios.create).not.toBeCalledWith(
// expect.objectContaining({
// adapter: expect.any(Function),
// }),
// );
// });

// it('when invalidate function on cache is called, it looks for clearCacheEntry in the request before invalidating the cache', async () => {
// const mockRemoveItem = jest.fn();
// const mockUuid = 'mockUuid';
// const mockConfig = {
// store: {
// removeItem: mockRemoveItem,
// },
// uuid: mockUuid,
// };

// customCacheInvalidate(mockConfig, {});
// expect(mockRemoveItem).not.toHaveBeenCalled();
// const mockRequest = { clearCacheEntry: true };

// customCacheInvalidate(mockConfig, mockRequest);
// expect(mockRemoveItem).toHaveBeenCalledWith(mockUuid);
// });
// });
});
});