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

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
Download patch file Download diff file Expand all files Collapse all files

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

@ -831,11 +831,10 @@ describe('webContents module', () => {
const protocol = session.defaultSession.protocol;
protocol.registerStringProtocol(scheme, (request, callback) => {
const response = `<script>
const {ipcRenderer, remote} = require('electron')
const {ipcRenderer} = require('electron')
ipcRenderer.send('set-zoom', window.location.hostname)
ipcRenderer.on(window.location.hostname + '-zoom-set', () => {
const { zoomLevel } = remote.getCurrentWebContents()
ipcRenderer.send(window.location.hostname + '-zoom-level', zoomLevel)
ipcRenderer.send(window.location.hostname + '-zoom-level')
})
</script>`;
callback({ data: response, mimeType: 'text/html' });
@ -921,14 +920,15 @@ describe('webContents module', () => {
});
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;
ipcMain.on('set-zoom', (e, host) => {
const zoomLevel = hostZoomMap[host];
if (!finalNavigation) w.webContents.zoomLevel = zoomLevel;
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;
expect(zoomLevel).to.equal(expectedZoomLevel);
if (finalNavigation) {
@ -937,7 +937,8 @@ describe('webContents module', () => {
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;
expect(zoomLevel).to.equal(expectedZoomLevel);
finalNavigation = true;
@ -947,7 +948,7 @@ describe('webContents module', () => {
});
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 });
w2.webContents.on('did-finish-load', () => {
const zoomLevel1 = w.webContents.zoomLevel;
@ -1047,7 +1048,8 @@ describe('webContents module', () => {
w2.close();
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'));
finalZoomLevel = zoomLevel;
});