Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(page): support multiple bootstrap scripts (#59)

Browse source
This commit is contained in:
Yury Semikhatsky 2019-11-22 16:25:36 -08:00 committed by Pavel Feldman
parent 7c69f8c457
commit ef847b1941
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/webkit/Page.ts
View file

@ -48,6 +48,7 @@ export class Page extends EventEmitter {
private _mouse: Mouse; private _mouse: Mouse;
private _timeoutSettings: TimeoutSettings; private _timeoutSettings: TimeoutSettings;
private _frameManager: FrameManager; private _frameManager: FrameManager;
private _bootstrapScripts: string[] = [];
_javascriptEnabled = true; _javascriptEnabled = true;
private _viewport: Viewport | null = null; private _viewport: Viewport | null = null;
private _screenshotTaskQueue: TaskQueue; private _screenshotTaskQueue: TaskQueue;
@ -346,7 +347,10 @@ export class Page extends EventEmitter {
} }
async evaluateOnNewDocument(pageFunction: Function | string, ...args: Array<any>) { async evaluateOnNewDocument(pageFunction: Function | string, ...args: Array<any>) {
const source = helper.evaluationString(pageFunction, ...args); const script = helper.evaluationString(pageFunction, ...args);
this._bootstrapScripts.push(script);
const source = this._bootstrapScripts.join(';');
// TODO(yurys): support process swap on navigation.
await this._session.send('Page.setBootstrapScript', { source }); await this._session.send('Page.setBootstrapScript', { source });
} }

11
test/evaluation.spec.js
View file

@ -264,6 +264,17 @@ module.exports.addTests = function({testRunner, expect, FFOX, CHROME, WEBKIT}) {
await page.goto(server.PREFIX + '/tamperable.html'); await page.goto(server.PREFIX + '/tamperable.html');
expect(await page.evaluate(() => window.result)).toBe(123); expect(await page.evaluate(() => window.result)).toBe(123);
}); });
fit('should support multiple scripts', async({page, server}) => {
await page.evaluateOnNewDocument(function(){
window.script1 = 1;
});
await page.evaluateOnNewDocument(function(){
window.script2 = 2;
});
await page.goto(server.PREFIX + '/tamperable.html');
expect(await page.evaluate(() => window.script1)).toBe(1);
expect(await page.evaluate(() => window.script2)).toBe(2);
});
it('should work with CSP', async({page, server}) => { it('should work with CSP', async({page, server}) => {
server.setCSP('/empty.html', 'script-src ' + server.PREFIX); server.setCSP('/empty.html', 'script-src ' + server.PREFIX);
await page.evaluateOnNewDocument(function(){ await page.evaluateOnNewDocument(function(){