diff --git a/extension/package.json b/extension/package.json index 92174e8c..85ebfd6d 100644 --- a/extension/package.json +++ b/extension/package.json @@ -44,8 +44,8 @@ "bestzip": "^2.1.7", "copy-webpack-plugin": "^6.3.1", "cross-env": "^7.0.2", - "electron": "^11.4.8", - "electron-chromedriver": "^11.0.0", + "electron": "^12.0.10", + "electron-chromedriver": "^12.0.0", "enzyme": "^3.11.0", "enzyme-adapter-react-15.4": "^1.4.2", "eslint": "^7.6.0", diff --git a/extension/test/electron/devpanel.spec.js b/extension/test/electron/devpanel.spec.js index cb76c9cc..98292efb 100644 --- a/extension/test/electron/devpanel.spec.js +++ b/extension/test/electron/devpanel.spec.js @@ -26,6 +26,13 @@ describe('DevTools panel for Electron', function () { }); it('should open Redux DevTools tab', async () => { + const windows = await this.driver.getAllWindowHandles(); + for (const window of windows) { + await this.driver.switchTo().window(window); + if ((await this.driver.getCurrentUrl()).startsWith('devtools')) { + break; + } + } expect(await this.driver.getCurrentUrl()).toMatch( /devtools:\/\/devtools\/bundled\/devtools_app.html/ ); diff --git a/extension/test/electron/fixture/main.js b/extension/test/electron/fixture/main.js index 8bd1e961..3631de8e 100644 --- a/extension/test/electron/fixture/main.js +++ b/extension/test/electron/fixture/main.js @@ -10,6 +10,7 @@ app.whenReady().then(async () => { height: 100, webPreferences: { nodeIntegration: true, + contextIsolation: false, }, }); mainWindow.loadFile('index.html'); diff --git a/extension/yarn.lock b/extension/yarn.lock index 23b1ec8b..b84c2b93 100644 --- a/extension/yarn.lock +++ b/extension/yarn.lock @@ -1012,7 +1012,7 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@electron/get@^1.0.1", "@electron/get@^1.12.2": +"@electron/get@^1.0.1", "@electron/get@^1.12.4": version "1.12.4" resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== @@ -1378,10 +1378,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d" integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg== -"@types/node@^12.0.12": - version "12.20.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.14.tgz#9caf7eea0df08b406829889cc015256a6d81ab10" - integrity sha512-iFJOS5Q470FF+r4Ol2pSley7/wCNVqf+jgjhtxLLaJcDs+To2iCxlXIkJXrGLD9w9G/oJ9ibySu7z92DCwr7Pg== +"@types/node@^14.6.2": + version "14.17.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.2.tgz#1e94476db57ec93a372c7f7d29aa5707cfb92339" + integrity sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -3892,12 +3892,12 @@ editor@~1.0.0: resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742" integrity sha1-YMf4e9YrzGqJT6jM1q+3gjok90I= -electron-chromedriver@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-11.0.0.tgz#49b034ed0ad12c12e3522862c7bb46875a0d85e1" - integrity sha512-ayMJPBbB4puU0SqYbcD9XvF3/7GWIhqKE1n5lG2/GQPRnrZkNoPIilsrS0rQcD50Xhl69KowatDqLhUznZWtbA== +electron-chromedriver@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-12.0.0.tgz#55bdc451b938b384642d613a05eadacb1fe476ee" + integrity sha512-zOs98o9+20Er8Q44z06h90VldwrJaoRCieW3Q8WkdDjA3cMRU5mlmm1kGDhPLMeYNuhq6e39aGMVH/IBFD97HQ== dependencies: - "@electron/get" "^1.12.2" + "@electron/get" "^1.12.4" extract-zip "^2.0.0" electron-to-chromium@^1.3.591: @@ -3905,13 +3905,13 @@ electron-to-chromium@^1.3.591: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz#c7ed98512c7ff36ddcbfed9e54e6355335c35257" integrity sha512-nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg== -electron@^11.4.8: - version "11.4.8" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.4.8.tgz#6f89be903bd917bda52afacf7cd3bdf2154b5c79" - integrity sha512-NrxlDZN1sWiDCWWOm5aX+tPGtiLgsCUwNqNFP3eJfY+RPdYLsxYRJDFa1vc4GcuCZEp9kZusINjmpPWsvJdspQ== +electron@^12.0.10: + version "12.0.10" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.10.tgz#d0879ff005a200d5b08dbfb3e5bbea744d38c71a" + integrity sha512-qaNvFG4AgeuT3PkSljQ9MlY7hz87wIwJ5cmSZ1453IVsUd0BV7pcaLViSpR1bRSqxetDDWxCLtCp0N9RXeDZww== dependencies: "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@types/node" "^14.6.2" extract-zip "^1.0.3" elliptic@^6.0.0: