hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into turn-on-strict

Browse Source
This commit is contained in:
Sebastian Malton 2022-05-13 16:26:15 -04:00
commit ec092848d6
2 changed files with 45 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/extensions/__tests__/is-compatible-extension.test.ts
View File

@ -8,122 +8,63 @@ import semver from "semver";
import { isCompatibleExtension } from "../extension-discovery/is-compatible-extension/is-compatible-extension";
import type { LensExtensionManifest } from "../lens-extension";
export function semverCoerce(from: string): semver.SemVer {
const parsed = semver.coerce(from);
assert(parsed, `"${from}" cannot be coerced to a SemVer value`);
return parsed;
}
describe("Extension/App versions compatibility check", () => {
describe("Extension/App versions compatibility checks", () => {
it("is compatible with exact version matching", () => {
expect(isCompatibleExtension({
appSemVer: semverCoerce("5.5.0"),
})(getExtensionManifestMock({
lensEngine: "5.5.0",
}))).toBeTruthy();
expect(isCompatible({ extLensEngineVersion: "5.5.0", appVersion: "5.5.0" })).toBeTruthy();
});
it("is compatible with upper %PATCH versions of base app", () => {
expect(isCompatibleExtension({
appSemVer: semverCoerce("5.5.5"),
})(getExtensionManifestMock({
lensEngine: "5.5.0",
}))).toBeTruthy();
expect(isCompatible({ extLensEngineVersion: "5.5.0", appVersion: "5.5.5" })).toBeTruthy();
});
it("is compatible with upper %MINOR version of base app", () => {
expect(isCompatibleExtension({
appSemVer: semverCoerce("5.6.0"),
})(getExtensionManifestMock({
lensEngine: "5.5.0",
}))).toBeTruthy();
expect(isCompatibleExtension({
appSemVer: semverCoerce("5.5.0-alpha.0"),
})(getExtensionManifestMock({
lensEngine: "^5.5.0",
}))).toBeTruthy();
expect(isCompatibleExtension({
appSemVer: semverCoerce("5.5"),
})(getExtensionManifestMock({
lensEngine: "^5.6.0",
}))).toBeFalsy();
it("is compatible with higher %MINOR version of base app", () => {
expect(isCompatible({ extLensEngineVersion: "5.5.0", appVersion: "5.6.0" })).toBeTruthy();
});
it("is not compatible with upper %MAJOR version of base app", () => {
expect(isCompatibleExtension({
appSemVer: semverCoerce("5.5.0"), // current lens-version
})(getExtensionManifestMock({
lensEngine: "6.0.0",
}))).toBeFalsy(); // extension with lens@6.0 is not compatible with app@5.5
expect(isCompatibleExtension({
appSemVer: semverCoerce("6.0.0"), // current lens-version
})(getExtensionManifestMock({
lensEngine: "5.5.0",
}))).toBeFalsy(); // extension with lens@5.5 is not compatible with app@6.0
it("is not compatible with higher %MAJOR version of base app", () => {
expect(isCompatible({ extLensEngineVersion: "5.6.0", appVersion: "6.0.0" })).toBeFalsy(); // extension for lens@5 not compatible with lens@6
expect(isCompatible({ extLensEngineVersion: "6.0.0", appVersion: "5.6.0" })).toBeFalsy();
});
it("is compatible with lensEngine with prerelease", () => {
expect(isCompatibleExtension({
appSemVer: new semver.SemVer("5.5.0-alpha.0"),
})(getExtensionManifestMock({
lensEngine: "^5.4.0-alpha.0",
}))).toBeTruthy();
expect(isCompatible({
extLensEngineVersion: "^5.4.0-alpha.0",
appVersion: "5.5.0-alpha.0",
})).toBeTruthy();
});
describe("supported formats for manifest.engines.lens", () => {
it("short version format for engines.lens", () => {
expect(isCompatibleExtension({
appSemVer: semverCoerce("5.5.0"),
})(getExtensionManifestMock({
lensEngine: "5.5",
}))).toBeTruthy();
});
it("supports short version format for manifest.engines.lens", () => {
expect(isCompatible({ extLensEngineVersion: "5.5", appVersion: "5.5.1" })).toBeTruthy();
});
it("validates version and throws if incorrect format", () => {
expect(() => isCompatibleExtension({
appSemVer: semverCoerce("1.0.0"),
})(getExtensionManifestMock({
lensEngine: "1.0",
}))).not.toThrow();
it("throws for incorrect or not supported version format", () => {
expect(() => isCompatible({
extLensEngineVersion: ">=2.0",
appVersion: "2.0",
})).toThrow(/Invalid format/i);
expect(() => isCompatibleExtension({
appSemVer: semverCoerce("1.0.0"),
})(getExtensionManifestMock({
lensEngine: "^1.0",
}))).not.toThrow();
expect(() => isCompatible({
extLensEngineVersion: "~2.0",
appVersion: "2.0",
})).toThrow(/Invalid format/i);
expect(() => isCompatibleExtension({
appSemVer: semverCoerce("1.0.0"),
})(getExtensionManifestMock({
lensEngine: ">=2.0",
}))).toThrow(/Invalid format/i);
expect(() => isCompatibleExtension({
appSemVer: semverCoerce("1.0.0"),
})(getExtensionManifestMock({
lensEngine: ">=2.0 <3.0",
}))).toThrow(/Invalid format/i);
});
it("'*' cannot be used for any version matching (at least in the prefix)", () => {
expect(() => isCompatibleExtension({
appSemVer: semverCoerce("1.0.0"),
})(getExtensionManifestMock({
lensEngine: "*",
}))).toThrowError(/Invalid format/i);
});
expect(() => isCompatible({
extLensEngineVersion: "*",
appVersion: "1.0",
})).toThrow(/Invalid format/i);
});
});
function getExtensionManifestMock(
{
lensEngine = "1.0",
} = {}): LensExtensionManifest {
function isCompatible({ extLensEngineVersion = "^1.0", appVersion = "1.0" } = {}): boolean {
const appSemVer = semver.coerce(appVersion);
const extensionManifestMock = getExtensionManifestMock(extLensEngineVersion);
assert(appSemVer);
return isCompatibleExtension({ appSemVer })(extensionManifestMock);
}
function getExtensionManifestMock(lensEngine = "1.0"): LensExtensionManifest {
return {
name: "some-extension",
version: "1.0",

24
src/main/app-updater.ts
View File

@ -28,10 +28,9 @@ function handleAutoUpdateBackChannel(event: Electron.IpcMainEvent, ...[arg]: Upd
autoUpdater.quitAndInstall(true, true);
} else {
logger.info(`${AutoUpdateLogPrefix}: User chose to update on quit`);
autoUpdater.autoInstallOnAppQuit = true;
}
} else {
logger.info(`${AutoUpdateLogPrefix}: User chose not to update`);
logger.info(`${AutoUpdateLogPrefix}: User chose not to update, will update on quit anyway`);
}
}
@ -44,9 +43,9 @@ autoUpdater.logger = {
/**
* starts the automatic update checking
* @param interval milliseconds between interval to check on, defaults to 24h
* @param interval milliseconds between interval to check on, defaults to 2h
*/
export const startUpdateChecking = once(function (interval = 1000 * 60 * 60 * 24): void {
export const startUpdateChecking = once(function (interval = 1000 * 60 * 60 * 2): void {
if (!isAutoUpdateEnabled() || isTestEnv) {
return;
}
@ -54,26 +53,17 @@ export const startUpdateChecking = once(function (interval = 1000 * 60 * 60 * 24
const userStore = UserStore.getInstance();
autoUpdater.autoDownload = false;
autoUpdater.autoInstallOnAppQuit = false;
autoUpdater.autoInstallOnAppQuit = true;
autoUpdater.channel = userStore.updateChannel;
autoUpdater.allowDowngrade = userStore.isAllowedToDowngrade;
autoUpdater
.on("update-available", (info: UpdateInfo) => {
if (autoUpdater.autoInstallOnAppQuit) {
// a previous auto-update loop was completed with YES+LATER, check if same version
if (installVersion === info.version) {
// same version, don't broadcast
return;
}
if (installVersion === info.version) {
// same version, don't broadcast
return;
}
/**
* This should be always set to false here because it is the reasonable
* default. Namely, if a don't auto update to a version that the user
* didn't ask for.
*/
autoUpdater.autoInstallOnAppQuit = false;
installVersion = info.version;
autoUpdater.downloadUpdate()