mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

test: skip remote module related tests when enable_remote_module = false (#23557)

Browse source
This commit is contained in:
Milan Burda 2020-05-13 20:05:44 +02:00 committed by GitHub
parent 85fae67966
commit fc468cce3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
spec-main/api-browser-window-spec.ts
View file

@ -1936,7 +1936,7 @@ describe('BrowserWindow module', () => {
}); });
}); });
describe('"enableRemoteModule" option', () => { ifdescribe(features.isRemoteModuleEnabled())('"enableRemoteModule" option', () => {
const generateSpecs = (description: string, sandbox: boolean) => { const generateSpecs = (description: string, sandbox: boolean) => {
describe(description, () => { describe(description, () => {
const preload = path.join(__dirname, 'fixtures', 'module', 'preload-remote.js'); const preload = path.join(__dirname, 'fixtures', 'module', 'preload-remote.js');
@ -2294,7 +2294,7 @@ describe('BrowserWindow module', () => {
}); });
// see #9387 // see #9387
it('properly manages remote object references after page reload', (done) => { ifit(features.isRemoteModuleEnabled())('properly manages remote object references after page reload', (done) => {
const w = new BrowserWindow({ const w = new BrowserWindow({
show: false, show: false,
webPreferences: { webPreferences: {
@ -2327,7 +2327,7 @@ describe('BrowserWindow module', () => {
}); });
}); });
it('properly manages remote object references after page reload in child window', (done) => { ifit(features.isRemoteModuleEnabled())('properly manages remote object references after page reload in child window', (done) => {
const w = new BrowserWindow({ const w = new BrowserWindow({
show: false, show: false,
webPreferences: { webPreferences: {

18
spec-main/api-web-contents-spec.ts
View file

@ -831,11 +831,10 @@ describe('webContents module', () => {
const protocol = session.defaultSession.protocol; const protocol = session.defaultSession.protocol;
protocol.registerStringProtocol(scheme, (request, callback) => { protocol.registerStringProtocol(scheme, (request, callback) => {
const response = `<script> const response = `<script>
const {ipcRenderer, remote} = require('electron') const {ipcRenderer} = require('electron')
ipcRenderer.send('set-zoom', window.location.hostname) ipcRenderer.send('set-zoom', window.location.hostname)
ipcRenderer.on(window.location.hostname + '-zoom-set', () => { ipcRenderer.on(window.location.hostname + '-zoom-set', () => {
const { zoomLevel } = remote.getCurrentWebContents() ipcRenderer.send(window.location.hostname + '-zoom-level')
ipcRenderer.send(window.location.hostname + '-zoom-level', zoomLevel)
}) })
</script>`; </script>`;
callback({ data: response, mimeType: 'text/html' }); callback({ data: response, mimeType: 'text/html' });
@ -921,14 +920,15 @@ describe('webContents module', () => {
}); });
it('can persist zoom level across navigation', (done) => { it('can persist zoom level across navigation', (done) => {
const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, enableRemoteModule: true } }); const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } });
let finalNavigation = false; let finalNavigation = false;
ipcMain.on('set-zoom', (e, host) => { ipcMain.on('set-zoom', (e, host) => {
const zoomLevel = hostZoomMap[host]; const zoomLevel = hostZoomMap[host];
if (!finalNavigation) w.webContents.zoomLevel = zoomLevel; if (!finalNavigation) w.webContents.zoomLevel = zoomLevel;
e.sender.send(`${host}-zoom-set`); e.sender.send(`${host}-zoom-set`);
}); });
ipcMain.on('host1-zoom-level', (e, zoomLevel) => { ipcMain.on('host1-zoom-level', (e) => {
const zoomLevel = e.sender.getZoomLevel();
const expectedZoomLevel = hostZoomMap.host1; const expectedZoomLevel = hostZoomMap.host1;
expect(zoomLevel).to.equal(expectedZoomLevel); expect(zoomLevel).to.equal(expectedZoomLevel);
if (finalNavigation) { if (finalNavigation) {
@ -937,7 +937,8 @@ describe('webContents module', () => {
w.loadURL(`${scheme}://host2`); w.loadURL(`${scheme}://host2`);
} }
}); });
ipcMain.once('host2-zoom-level', (e, zoomLevel) => { ipcMain.once('host2-zoom-level', (e) => {
const zoomLevel = e.sender.getZoomLevel();
const expectedZoomLevel = hostZoomMap.host2; const expectedZoomLevel = hostZoomMap.host2;
expect(zoomLevel).to.equal(expectedZoomLevel); expect(zoomLevel).to.equal(expectedZoomLevel);
finalNavigation = true; finalNavigation = true;
@ -947,7 +948,7 @@ describe('webContents module', () => {
}); });
it('can propagate zoom level across same session', (done) => { it('can propagate zoom level across same session', (done) => {
const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, enableRemoteModule: true } }); const w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true } });
const w2 = new BrowserWindow({ show: false }); const w2 = new BrowserWindow({ show: false });
w2.webContents.on('did-finish-load', () => { w2.webContents.on('did-finish-load', () => {
const zoomLevel1 = w.webContents.zoomLevel; const zoomLevel1 = w.webContents.zoomLevel;
@ -1047,7 +1048,8 @@ describe('webContents module', () => {
w2.close(); w2.close();
done(); done();
}); });
ipcMain.once('temporary-zoom-set', (e, zoomLevel) => { ipcMain.once('temporary-zoom-set', (e) => {
const zoomLevel = e.sender.getZoomLevel();
w2.loadFile(path.join(fixturesPath, 'pages', 'c.html')); w2.loadFile(path.join(fixturesPath, 'pages', 'c.html'));
finalZoomLevel = zoomLevel; finalZoomLevel = zoomLevel;
}); });

4
spec-main/fixtures/module/delete-buffer.js
View file

@ -6,6 +6,8 @@ delete window.Buffer;
delete global.Buffer; delete global.Buffer;
// Test that remote.js doesn't use Buffer global // Test that remote.js doesn't use Buffer global
remote.require(path.join(__dirname, 'print_name.js')).echo(Buffer.from('bar')); if (remote) {
remote.require(path.join(__dirname, 'print_name.js')).echo(Buffer.from('bar'));
}
window.test = Buffer.from('buffer'); window.test = Buffer.from('buffer');

5
spec-main/webview-spec.ts
View file

@ -2,8 +2,11 @@ import * as path from 'path';
import { BrowserWindow, session, ipcMain, app, WebContents } from 'electron/main'; import { BrowserWindow, session, ipcMain, app, WebContents } from 'electron/main';
import { closeAllWindows } from './window-helpers'; import { closeAllWindows } from './window-helpers';
import { emittedOnce } from './events-helpers'; import { emittedOnce } from './events-helpers';
import { ifdescribe } from './spec-helpers';
import { expect } from 'chai'; import { expect } from 'chai';
const features = process.electronBinding('features');
async function loadWebView (w: WebContents, attributes: Record<string, string>, openDevTools: boolean = false): Promise<void> { async function loadWebView (w: WebContents, attributes: Record<string, string>, openDevTools: boolean = false): Promise<void> {
await w.executeJavaScript(` await w.executeJavaScript(`
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
@ -570,7 +573,7 @@ describe('<webview> tag', function () {
}); });
}); });
describe('enableremotemodule attribute', () => { ifdescribe(features.isRemoteModuleEnabled())('enableremotemodule attribute', () => {
let w: BrowserWindow; let w: BrowserWindow;
beforeEach(async () => { beforeEach(async () => {
w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, webviewTag: true } }); w = new BrowserWindow({ show: false, webPreferences: { nodeIntegration: true, webviewTag: true } });