Skip to content

Commit 0a7537f

Browse files
committed
Modify tests about zoom persistence to properly simulate cross-origin navigation
1 parent 8994c9f commit 0a7537f

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

spec/api-web-contents-spec.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const http = require('http')
88
const path = require('path')
99
const { closeWindow } = require('./window-helpers')
1010
const { emittedOnce } = require('./events-helpers')
11+
const { createNetworkSandbox } = require('./network-helper')
1112
const chai = require('chai')
1213
const dirtyChai = require('dirty-chai')
1314

@@ -704,6 +705,11 @@ describe('webContents module', () => {
704705
})
705706

706707
it('cannot persist zoom level after navigation with webFrame', (done) => {
708+
const protocol = session.defaultSession.protocol
709+
const sandbox = createNetworkSandbox(protocol)
710+
sandbox.serveFileFromProtocol('ccc', path.join(fixtures, 'pages', 'c.html'))
711+
sandbox.serveFileFromProtocol('ddd', path.join(fixtures, 'pages', 'd.html'))
712+
707713
let initialNavigation = true
708714
const source = `
709715
const {ipcRenderer, webFrame} = require('electron')
@@ -716,15 +722,16 @@ describe('webContents module', () => {
716722
} else {
717723
const zoomLevel = w.webContents.getZoomLevel()
718724
assert.strictEqual(zoomLevel, 0)
725+
sandbox.reset()
719726
done()
720727
}
721728
})
722729
ipcMain.once('zoom-level-set', (e, zoomLevel) => {
723730
assert.strictEqual(zoomLevel, 0.6)
724-
w.loadFile(path.join(fixtures, 'pages', 'd.html'))
731+
w.loadURL('ddd://page')
725732
initialNavigation = false
726733
})
727-
w.loadFile(path.join(fixtures, 'pages', 'c.html'))
734+
w.loadURL('ccc://page')
728735
})
729736
})
730737

0 commit comments

Comments
 (0)