fix: lost window.opener after cross-origin navigation (#18173)
* Get a site instance related to current one instead of creation a new one Using `GetRelatedSiteInstance` will keep the relation (same browsing instance) between the current and the new site instance. * Some relies on preloads in opened window The fact that, now, we always have an opener for opened windows diables note integration in opened windows, except if `nodeIntegrationInSubFrames` is enabled. * Add a test on window.opener after cross-orgin navigation * Make sure to unregisterProtocol in tests * Introduc and use a NetworkSandbox for tests * Modify tests about zoom persistence to properly simulate cross-origin navigation * Revert "Modify tests about zoom persistence to properly simulate cross-origin navigation" This reverts commit 0a7537f2eb7f183ddec16637e8a2e92a0d600321.
This commit is contained in:
parent
cec61d010b
commit
b4276835d8
4 changed files with 206 additions and 30 deletions
75
spec/network-helper.js
Normal file
75
spec/network-helper.js
Normal file
|
@ -0,0 +1,75 @@
|
|||
const fs = require('fs')
|
||||
|
||||
/**
|
||||
* Test sandbox environment used to fake network responses.
|
||||
*/
|
||||
class NetworkSandbox {
|
||||
constructor (protocol) {
|
||||
this.protocol = protocol
|
||||
this._resetFns = []
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset the sandbox.
|
||||
*/
|
||||
async reset () {
|
||||
for (const resetFn of this._resetFns) {
|
||||
await resetFn()
|
||||
}
|
||||
this._resetFns = []
|
||||
}
|
||||
|
||||
/**
|
||||
* Will serve the content of file at `filePath` to network requests towards
|
||||
* `protocolName` scheme.
|
||||
*
|
||||
* Example: `sandbox.serveFileFromProtocol('foo', 'index.html')` will serve the content
|
||||
* of 'index.html' to `foo://page` requests.
|
||||
*
|
||||
* @param {string} protocolName
|
||||
* @param {string} filePath
|
||||
*/
|
||||
serveFileFromProtocol (protocolName, filePath) {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.protocol.registerBufferProtocol(protocolName, (request, callback) => {
|
||||
// Disabled due to false positive in StandardJS
|
||||
// eslint-disable-next-line standard/no-callback-literal
|
||||
callback({
|
||||
mimeType: 'text/html',
|
||||
data: fs.readFileSync(filePath)
|
||||
})
|
||||
}, (error) => {
|
||||
if (error != null) {
|
||||
reject(error)
|
||||
} else {
|
||||
this._resetFns.push(() => this.unregisterProtocol(protocolName))
|
||||
resolve()
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
unregisterProtocol (protocolName) {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.protocol.unregisterProtocol(protocolName, (error) => {
|
||||
if (error != null) {
|
||||
reject(error)
|
||||
} else {
|
||||
resolve()
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Will create a NetworkSandbox that uses
|
||||
* `protocol` as `Electron.Protocol`.
|
||||
*
|
||||
* @param {Electron.Protocol} protocol
|
||||
*/
|
||||
function createNetworkSandbox (protocol) {
|
||||
return new NetworkSandbox(protocol)
|
||||
}
|
||||
|
||||
exports.createNetworkSandbox = createNetworkSandbox
|
Loading…
Add table
Add a link
Reference in a new issue