chore: set fixtures to contentIsolation: false, update deprecation lo…

…g number
electron-userland · Mar 3, 2021 · f60fdbc · f60fdbc
1 parent 86bffe8
commit f60fdbc
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 12 deletions.
diff --git a/test/application-test.js b/test/application-test.js
@@ -149,7 +149,7 @@ describe('application loading', function () {
     it('gets the render process console logs and clears them', async function () {
       await app.client.waitUntilWindowLoaded();
       let logs = await app.client.getRenderProcessLogs();
-      expect(logs.length).to.equal(2);
+      expect(logs.length).to.equal(3);
       expect(logs[0].message).to.contain('7:14 "render warn"');
       expect(logs[0].source).to.equal('console-api');
       expect(logs[0].level).to.equal('WARNING');

diff --git a/test/fixtures/accessible/main.js b/test/fixtures/accessible/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow } = require('electron');
+require('@electron/remote/main').initialize();
 
 let mainWindow = null;
 
@@ -9,7 +10,8 @@ app.on('ready', function () {
     height: 600,
     webPreferences: {
       nodeIntegration: true,
-      enableRemoteModule: true
+      enableRemoteModule: true,
+      contextIsolation: false
     }
   });
   mainWindow.loadFile('index.html');

diff --git a/test/fixtures/app/main.js b/test/fixtures/app/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow, ipcMain } = require('electron');
+require('@electron/remote/main').initialize();
 const fs = require('fs');
 const path = require('path');
 
@@ -20,7 +21,8 @@ app.on('ready', function () {
     height: 100,
     webPreferences: {
       enableRemoteModule: true,
-      nodeIntegration: true
+      nodeIntegration: true,
+      contextIsolation: false,
     }
   });
   mainWindow.loadFile('index.html');

diff --git a/test/fixtures/example/main.js b/test/fixtures/example/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow } = require('electron');
+require('@electron/remote/main').initialize();
 
 let mainWindow = null;
 
@@ -11,7 +12,8 @@ app.on('ready', function () {
     minWidth: 100,
     webPreferences: {
       nodeIntegration: true,
-      enableRemoteModule: true
+      enableRemoteModule: true,
+      contextIsolation: false,
     }
   });
   mainWindow.loadFile('index.html');

diff --git a/test/fixtures/multi-window/main.js b/test/fixtures/multi-window/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow } = require('electron');
+require('@electron/remote/main').initialize();
 
 let topWindow = null;
 let bottomWindow = null;
@@ -11,7 +12,8 @@ app.on('ready', function () {
     height: 100,
     webPreferences: {
       nodeIntegration: true,
-      enableRemoteModule: true
+      enableRemoteModule: true,
+      contextIsolation: false
     }
   });
   topWindow.loadFile('index-top.html');
@@ -26,7 +28,8 @@ app.on('ready', function () {
     height: 50,
     webPreferences: {
       nodeIntegration: true,
-      enableRemoteModule: true
+      enableRemoteModule: true,
+      contextIsolation: false
     }
   });
   bottomWindow.loadFile('index-bottom.html');

diff --git a/test/fixtures/no-node-integration/main.js b/test/fixtures/no-node-integration/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow } = require('electron');
+require('@electron/remote/main').initialize();
 
 let mainWindow = null;
 
@@ -10,7 +11,8 @@ app.on('ready', function () {
     height: 100,
     webPreferences: {
       nodeIntegration: false,
-      enableRemoteModule: true
+      enableRemoteModule: true,
+      contextIsolation: false
     }
   });
   mainWindow.loadFile('index.html');

diff --git a/test/fixtures/not-accessible/main.js b/test/fixtures/not-accessible/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow } = require('electron');
+require('@electron/remote/main').initialize();
 
 let mainWindow = null;
 
@@ -9,8 +10,9 @@ app.on('ready', function () {
     height: 600,
     webPreferences: {
       nodeIntegration: true,
-      webviewTag: true,
-      enableRemoteModule: true
+      contextIsolation: false,
+      enableRemoteModule: true,
+      webviewTag: true
     }
   });
   mainWindow.loadFile('index.html');

diff --git a/test/fixtures/require-name/main.js b/test/fixtures/require-name/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow } = require('electron');
+require('@electron/remote/main').initialize();
 const path = require('path');
 
 let mainWindow = null;
@@ -12,7 +13,8 @@ app.on('ready', function () {
     webPreferences: {
       nodeIntegration: false,
       preload: path.join(__dirname, 'preload.js'),
-      enableRemoteModule: true
+      enableRemoteModule: true,
+      contextIsolation: false
     }
   });
   mainWindow.loadFile('index.html');

diff --git a/test/fixtures/slow/main.js b/test/fixtures/slow/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow } = require('electron');
+require('@electron/remote/main').initialize();
 
 let mainWindow = null;
 
@@ -10,7 +11,8 @@ app.on('ready', function () {
     height: 100,
     webPreferences: {
       nodeIntegration: true,
-      enableRemoteModule: true
+      enableRemoteModule: true,
+      contextIsolation: false
     }
   });
   mainWindow.loadFile('index.html');

diff --git a/test/fixtures/web-view/main.js b/test/fixtures/web-view/main.js
@@ -1,4 +1,5 @@
 const { app, BrowserWindow } = require('electron');
+require('@electron/remote/main').initialize();
 
 let mainWindow = null;
 
@@ -11,8 +12,9 @@ app.on('ready', function () {
     minWidth: 100,
     webPreferences: {
       nodeIntegration: true,
+      enableRemoteModule: true,
+      contextIsolation: false,
       webviewTag: true,
-      enableRemoteModule: true
     }
   });
   mainWindow.loadFile('index.html');