root
/
playwright
mirror of https://github.com/microsoft/playwright.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

test: rebaseline wk/mac network tests

This commit is contained in:
Pavel Feldman 2019-12-11 19:32:07 -08:00
parent b76266d874
commit 19cac9a0c1
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/webkit/FrameManager.ts
View File

@ -553,7 +553,7 @@ export class FrameManager extends EventEmitter implements PageDelegate {
} }
private _requestFailed(request: network.Request) { private _requestFailed(request: network.Request) {
if (request.isNavigationRequest() && request.failure().errorText !== 'Load request cancelled') { if (request.isNavigationRequest() && !request.failure().errorText.includes('cancelled')) {
request.frame()._onExpectedNewDocumentNavigation('fake-loader-id', request.url()); request.frame()._onExpectedNewDocumentNavigation('fake-loader-id', request.url());
request.frame()._onAbortedNewDocumentNavigation('fake-loader-id', request.failure().errorText); request.frame()._onAbortedNewDocumentNavigation('fake-loader-id', request.failure().errorText);
} }

26
test/navigation.spec.js
View File

@ -106,24 +106,32 @@ module.exports.addTests = function({testRunner, expect, playwright, FFOX, CHROME
page.on('requestfailed', request => expect(request).toBeTruthy()); page.on('requestfailed', request => expect(request).toBeTruthy());
let error = null; let error = null;
await page.goto(httpsServer.EMPTY_PAGE).catch(e => error = e); await page.goto(httpsServer.EMPTY_PAGE).catch(e => error = e);
if (CHROME) if (CHROME) {
expect(error.message).toContain('net::ERR_CERT_AUTHORITY_INVALID'); expect(error.message).toContain('net::ERR_CERT_AUTHORITY_INVALID');
else if (WEBKIT) } else if (WEBKIT) {
expect(error.message).toContain('Unacceptable TLS certificate'); if (process.platform === 'darwin')
else expect(error.message).toContain('The certificate for this server is invalid');
else
expect(error.message).toContain('Unacceptable TLS certificate');
} else {
expect(error.message).toContain('SSL_ERROR_UNKNOWN'); expect(error.message).toContain('SSL_ERROR_UNKNOWN');
}
}); });
it('should fail when navigating to bad SSL after redirects', async({page, server, httpsServer}) => { it('should fail when navigating to bad SSL after redirects', async({page, server, httpsServer}) => {
server.setRedirect('/redirect/1.html', '/redirect/2.html'); server.setRedirect('/redirect/1.html', '/redirect/2.html');
server.setRedirect('/redirect/2.html', '/empty.html'); server.setRedirect('/redirect/2.html', '/empty.html');
let error = null; let error = null;
await page.goto(httpsServer.PREFIX + '/redirect/1.html').catch(e => error = e); await page.goto(httpsServer.PREFIX + '/redirect/1.html').catch(e => error = e);
if (CHROME) if (CHROME) {
expect(error.message).toContain('net::ERR_CERT_AUTHORITY_INVALID'); expect(error.message).toContain('net::ERR_CERT_AUTHORITY_INVALID');
else if (WEBKIT) } else if (WEBKIT) {
expect(error.message).toContain('Unacceptable TLS certificate'); if (process.platform === 'darwin')
else expect(error.message).toContain('The certificate for this server is invalid');
else
expect(error.message).toContain('Unacceptable TLS certificate');
} else {
expect(error.message).toContain('SSL_ERROR_UNKNOWN'); expect(error.message).toContain('SSL_ERROR_UNKNOWN');
}
}); });
xit('should throw if networkidle is passed as an option', async({page, server}) => { xit('should throw if networkidle is passed as an option', async({page, server}) => {
let error = null; let error = null;
@ -136,7 +144,7 @@ module.exports.addTests = function({testRunner, expect, playwright, FFOX, CHROME
if (CHROME) if (CHROME)
expect(error.message).toContain('net::ERR_CONNECTION_REFUSED'); expect(error.message).toContain('net::ERR_CONNECTION_REFUSED');
else if (WEBKIT) else if (WEBKIT)
expect(error.message).toContain('Could not connect: Connection refused'); expect(error.message).toContain('Could not connect');
else else
expect(error.message).toContain('NS_ERROR_CONNECTION_REFUSED'); expect(error.message).toContain('NS_ERROR_CONNECTION_REFUSED');
}); });