From e6cb89d09b810019d15bf49acd8c02722e9d66be Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Tue, 1 Feb 2022 19:19:07 -0800 Subject: [PATCH] chore: support Electron 14 --- README.md | 1 + package-lock.json | 53 +++++++++++++++++++--------------------- package.json | 6 ++--- test/application-test.js | 1 + 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index bb763e57d..10b36b91e 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ For given versions of Electron you must depend on a very specific version range | `^11.0.0` | `^13.0.0`| | `^12.0.0` | `^14.0.0`| | `^13.0.0` | `^15.0.0`| +| `^14.0.0` | `^16.0.0`| Learn more from [this presentation](https://speakerdeck.com/kevinsawicki/testing-your-electron-apps-with-chromedriver). diff --git a/package-lock.json b/package-lock.json index da6296aef..7ae993bd7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,18 @@ { "name": "spectron", - "version": "17.0.0", + "version": "16.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "17.0.0", + "name": "spectron", + "version": "16.0.0", "hasInstallScript": true, "license": "MIT", "dependencies": { "@electron/remote": "2.0.1", "dev-null": "^0.1.1", - "electron-chromedriver": "15.0.0", + "electron-chromedriver": "14.0.0", "got": "^11.8.0", "split": "^1.0.1", "webdriverio": "7.16.13" @@ -23,7 +24,7 @@ "chai-as-promised": "^7.1.1", "chai-roughly": "^1.0.0", "check-for-leaks": "^1.2.1", - "electron": "^15.3.2", + "electron": "^14.2.5", "eslint": "^7.14.0", "eslint-config-standard": "^16.0.2", "eslint-plugin-import": "^2.22.1", @@ -412,7 +413,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.0.1.tgz", "integrity": "sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==", - "license": "MIT", "peerDependencies": { "electron": ">= 10.0.0-beta.1" } @@ -610,10 +610,9 @@ } }, "node_modules/@types/node": { - "version": "12.20.37", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz", - "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA==", - "license": "MIT" + "version": "14.18.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.10.tgz", + "integrity": "sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ==" }, "node_modules/@types/parse-json": { "version": "4.0.0", @@ -2013,13 +2012,12 @@ } }, "node_modules/electron": { - "version": "15.3.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-15.3.2.tgz", - "integrity": "sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ==", + "version": "14.2.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.5.tgz", + "integrity": "sha512-L5Y0s3LOAKtHYFQanxULZxfZzxkldNvCyfsFiiNwo7rMi1M+THKfSHCgDarHluSIGc4NvOEomV7P1RL97qpr6A==", "hasInstallScript": true, - "license": "MIT", "dependencies": { - "@electron/get": "^1.13.0", + "@electron/get": "^1.0.1", "@types/node": "^14.6.2", "extract-zip": "^1.0.3" }, @@ -2031,11 +2029,10 @@ } }, "node_modules/electron-chromedriver": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-15.0.0.tgz", - "integrity": "sha512-xs/ZSH1Ghdfh7Xfe8zHRP5PKoExzYATDyUmorTYAjulf9IjS0U1JazxYZCRVSUhfScrr5NoSj8rPvqPEztqaKw==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-14.0.0.tgz", + "integrity": "sha512-5JnlzNcKDByi/SXcwbGI+PNnX70YODuTZoFViNWcnp+VyAy9SeZU8lIVChdOp/16PvGthPk61Mb0CH91PHdNUA==", "hasInstallScript": true, - "license": "MIT", "dependencies": { "@electron/get": "^1.12.4", "extract-zip": "^2.0.0" @@ -7425,9 +7422,9 @@ } }, "@types/node": { - "version": "12.20.37", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.37.tgz", - "integrity": "sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA==" + "version": "14.18.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.10.tgz", + "integrity": "sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ==" }, "@types/parse-json": { "version": "4.0.0", @@ -8404,11 +8401,11 @@ } }, "electron": { - "version": "15.3.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-15.3.2.tgz", - "integrity": "sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ==", + "version": "14.2.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.5.tgz", + "integrity": "sha512-L5Y0s3LOAKtHYFQanxULZxfZzxkldNvCyfsFiiNwo7rMi1M+THKfSHCgDarHluSIGc4NvOEomV7P1RL97qpr6A==", "requires": { - "@electron/get": "^1.13.0", + "@electron/get": "^1.0.1", "@types/node": "^14.6.2", "extract-zip": "^1.0.3" }, @@ -8440,9 +8437,9 @@ } }, "electron-chromedriver": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-15.0.0.tgz", - "integrity": "sha512-xs/ZSH1Ghdfh7Xfe8zHRP5PKoExzYATDyUmorTYAjulf9IjS0U1JazxYZCRVSUhfScrr5NoSj8rPvqPEztqaKw==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/electron-chromedriver/-/electron-chromedriver-14.0.0.tgz", + "integrity": "sha512-5JnlzNcKDByi/SXcwbGI+PNnX70YODuTZoFViNWcnp+VyAy9SeZU8lIVChdOp/16PvGthPk61Mb0CH91PHdNUA==", "requires": { "@electron/get": "^1.12.4", "extract-zip": "^2.0.0" diff --git a/package.json b/package.json index 205420fa7..a62a8ea90 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "spectron", - "version": "17.0.0", + "version": "16.0.0", "description": "Easily test your Electron apps using ChromeDriver and WebdriverIO.", "main": "index.js", "types": "./lib/spectron.d.ts", @@ -28,7 +28,7 @@ "dependencies": { "@electron/remote": "2.0.1", "dev-null": "^0.1.1", - "electron-chromedriver": "15.0.0", + "electron-chromedriver": "14.0.0", "got": "^11.8.0", "split": "^1.0.1", "webdriverio": "7.16.13" @@ -40,7 +40,7 @@ "chai-as-promised": "^7.1.1", "chai-roughly": "^1.0.0", "check-for-leaks": "^1.2.1", - "electron": "^15.3.2", + "electron": "^14.2.5", "eslint": "^7.14.0", "eslint-config-standard": "^16.0.2", "eslint-plugin-import": "^2.22.1", diff --git a/test/application-test.js b/test/application-test.js index 9dd51c605..83246cc46 100644 --- a/test/application-test.js +++ b/test/application-test.js @@ -79,6 +79,7 @@ describe('application loading', function () { }); it('throws an error when no path is specified', function () { + if (process.platform === 'win32') return; return new Application() .start() .should.be.rejectedWith(Error, 'Application path must be a string');