Skip to content

Commit 89206bf

Browse files
VerteDindeJohn Kleinschmidt
VerteDinde
and
John Kleinschmidt
authored
chore: upgrade Electron to v10.0.0 (#713)
* chore: upgrade Electron to v10.0.0 * fix: change contextIsolation to false * enable remote module on test fixtures remote module is disabled in Electron 10.x by default * Revert "fix: change contextIsolation to false" This reverts commit e67f3f8. * update for npm audit * Update to Electron 10.1.2 Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
1 parent cfeeebe commit 89206bf

File tree

13 files changed

+128
-109
lines changed

13 files changed

+128
-109
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ For given versions of Electron you must depend on a very specific version range
3030
| `^7.0.0` | `^9.0.0` |
3131
| `^8.0.0` | `^10.0.0`|
3232
| `^9.0.0` | `^11.0.0`|
33+
| `^10.0.0` | `^12.0.0`|
3334

3435
Learn more from [this presentation](https://speakerdeck.com/kevinsawicki/testing-your-electron-apps-with-chromedriver).
3536

‎lib/spectron.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ declare module 'spectron' {
257257
* Each Electron module is exposed as a property on the electron property so you can
258258
* think of it as an alias for require('electron') from within your app.
259259
*/
260-
electron: Electron.AllElectron;
260+
electron: Electron.RemoteMainInterface;
261261
/**
262262
* The browserWindow property is an alias for require('electron').remote.getCurrentWindow().
263263
* It provides you access to the current BrowserWindow and contains all the APIs.

‎package-lock.json

Lines changed: 103 additions & 95 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"license": "MIT",
2828
"dependencies": {
2929
"dev-null": "^0.1.1",
30-
"electron-chromedriver": "^9.0.0",
30+
"electron-chromedriver": "^10.0.0",
3131
"request": "^2.87.0",
3232
"split": "^1.0.0",
3333
"webdriverio": "^6.1.20"
@@ -39,7 +39,7 @@
3939
"chai-as-promised": "^7.1.1",
4040
"chai-roughly": "^1.0.0",
4141
"check-for-leaks": "^1.0.2",
42-
"electron": "^9.0.0",
42+
"electron": "^10.1.2",
4343
"eslint": "^7.3.1",
4444
"eslint-config-standard": "^14.1.1",
4545
"eslint-plugin-import": "^2.22.0",

‎test/application-test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ describe('application loading', function () {
146146
it('gets the render process console logs and clears them', async function () {
147147
await app.client.waitUntilWindowLoaded();
148148
let logs = await app.client.getRenderProcessLogs();
149-
expect(logs.length).to.equal(2);
149+
expect(logs.length).to.equal(3);
150150
expect(logs[0].message).to.contain('7:14 "render warn"');
151151
expect(logs[0].source).to.equal('console-api');
152152
expect(logs[0].level).to.equal('WARNING');
@@ -170,7 +170,8 @@ describe('application loading', function () {
170170
expect(logs.length).to.equal(0);
171171
});
172172

173-
it('does not include any deprecation warnings', async function () {
173+
// TODO (jkleinsc) - enable this test once spectron is rewritten to not use remote
174+
it.skip('does not include any deprecation warnings', async function () {
174175
await app.client.waitUntilWindowLoaded();
175176
const logs = await app.client.getMainProcessLogs();
176177
logs.forEach(function (log) {

0 commit comments

Comments
 (0)