FIX tests && FIX bootstrap errors

This commit is contained in:
Norbert de Langen 2019-03-09 00:10:48 +01:00
parent fd968846f2
commit 36e4cfa2dd
4 changed files with 25 additions and 11 deletions

View File

@ -35,6 +35,7 @@
"memoizerific": "^1.11.3",
"prop-types": "^15.6.2",
"react": "^16.7.0",
"semver": "^5.6.0",
"util-deprecate": "^1.0.2"
},
"devDependencies": {},

View File

@ -82,6 +82,9 @@ export default function({ store }: Module) {
const latest = api.getLatestVersion();
const current = api.getCurrentVersion();
if (!latest || !latest.version) {
return true;
}
return latest && semver.gt(latest.version, current.version);
},
};
@ -94,9 +97,11 @@ export default function({ store }: Module) {
if (!lastVersionCheck || now - lastVersionCheck > checkInterval) {
try {
const { latest, next } = await fetchLatestVersion(currentVersion);
await store.setState(
{ versions: { ...versions, latest, next }, lastVersionCheck: now },
{
versions: { ...versions, latest, next },
lastVersionCheck: now,
},
{ persistence: 'permanent' }
);
} catch (error) {
@ -104,8 +109,8 @@ export default function({ store }: Module) {
}
}
if (fullApi.versionUpdateAvailable()) {
const latestVersion = fullApi.getLatestVersion().version;
if (api.versionUpdateAvailable()) {
const latestVersion = api.getLatestVersion().version;
if (latestVersion !== dismissedVersionNotification) {
fullApi.addNotification({

View File

@ -33,11 +33,13 @@ const makeResponse = (latest, next) => {
},
};
return {
json: jest.fn().mockResolvedValue({
latest: {
version: latest,
},
...nextVersion,
json: jest.fn(() => {
return Promise.resolve({
latest: {
version: latest,
},
...nextVersion,
});
}),
};
};
@ -76,10 +78,14 @@ describe('versions API', () => {
const store = createMockStore();
const { state: initialState, init, api } = initVersions({ store });
store.setState(initialState);
store.setState.mockReset();
fetch.mockResolvedValueOnce(newResponse);
store.setState.mockReset();
await init({ api: { addNotification: jest.fn(), ...api } });
// expect(fetch.mock.calls).toBe(1);
expect(store.setState).toHaveBeenCalledWith(
{
versions: {
@ -99,6 +105,7 @@ describe('versions API', () => {
current: { version: '3.0.0' },
latest: { version: '3.1.0' },
},
lastVersionCheck: 0,
});
const { state: initialState, init, api } = initVersions({ store });
@ -110,8 +117,8 @@ describe('versions API', () => {
expect(store.setState).toHaveBeenCalledWith(
{
versions: {
latest: { version: '4.0.0' },
current: { version: '3.0.0' },
latest: { version: '4.0.0' },
},
lastVersionCheck: expect.any(Number),
},

View File

@ -2,3 +2,4 @@
declare module 'react-inspector';
declare module 'lodash.mergewith';
declare module 'lodash.isequal';
declare module 'react-inspector';