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

test: rebaseline with win32 in mind (#499)

Browse source
This commit is contained in:
Pavel Feldman 2020-01-15 13:40:44 -08:00 committed by GitHub
parent ce1e79fe9f
commit 6f92d19cdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/webkit/wkConnection.ts
View file

@ -21,7 +21,6 @@ import { ConnectionTransport } from '../transport';
import { Protocol } from './protocol'; import { Protocol } from './protocol';
const debugProtocol = platform.debug('pw:protocol'); const debugProtocol = platform.debug('pw:protocol');
const debugWrappedMessage = platform.debug('pw:wrapped');
// WKBrowserServer uses this special id to issue Browser.close command which we // WKBrowserServer uses this special id to issue Browser.close command which we
// should ignore. // should ignore.
@ -126,7 +125,7 @@ export class WKSession extends platform.EventEmitter {
return Promise.reject(new Error(`Protocol error (${method}): ${this.errorText}`)); return Promise.reject(new Error(`Protocol error (${method}): ${this.errorText}`));
const id = this.connection.nextMessageId(); const id = this.connection.nextMessageId();
const messageObj = { id, method, params }; const messageObj = { id, method, params };
debugWrappedMessage('SEND ► ' + JSON.stringify(messageObj, null, 2)); platform.debug('pw:wrapped:' + this.sessionId)('SEND ► ' + JSON.stringify(messageObj, null, 2));
const result = new Promise<Protocol.CommandReturnValues[T]>((resolve, reject) => { const result = new Promise<Protocol.CommandReturnValues[T]>((resolve, reject) => {
this._callbacks.set(id, {resolve, reject, error: new Error(), method}); this._callbacks.set(id, {resolve, reject, error: new Error(), method});
}); });
@ -146,7 +145,7 @@ export class WKSession extends platform.EventEmitter {
} }
dispatchMessage(object: any) { dispatchMessage(object: any) {
debugWrappedMessage('◀ RECV ' + JSON.stringify(object, null, 2)); platform.debug('pw:wrapped:' + this.sessionId)('◀ RECV ' + JSON.stringify(object, null, 2));
if (object.id && this._callbacks.has(object.id)) { if (object.id && this._callbacks.has(object.id)) {
const callback = this._callbacks.get(object.id)!; const callback = this._callbacks.get(object.id)!;
this._callbacks.delete(object.id); this._callbacks.delete(object.id);

4
test/navigation.spec.js
View file

@ -172,6 +172,8 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
await page.goto('http://localhost:44123/non-existing-url').catch(e => error = e); await page.goto('http://localhost:44123/non-existing-url').catch(e => error = e);
if (CHROMIUM) if (CHROMIUM)
expect(error.message).toContain('net::ERR_CONNECTION_REFUSED'); expect(error.message).toContain('net::ERR_CONNECTION_REFUSED');
else if (WEBKIT && process.platform === 'win32')
expect(error.message).toContain(`Couldn\'t connect to server`);
else if (WEBKIT) else if (WEBKIT)
expect(error.message).toContain('Could not connect'); expect(error.message).toContain('Could not connect');
else else
@ -898,6 +900,8 @@ module.exports.describe = function({testRunner, expect, playwright, FFOX, CHROMI
} else if (WEBKIT) { } else if (WEBKIT) {
if (process.platform === 'darwin') if (process.platform === 'darwin')
expect(errorMessage).toContain('The certificate for this server is invalid'); expect(errorMessage).toContain('The certificate for this server is invalid');
else if (process.platform === 'win32')
expect(errorMessage).toContain('SSL peer certificate or SSH remote key was not OK');
else else
expect(errorMessage).toContain('Unacceptable TLS certificate'); expect(errorMessage).toContain('Unacceptable TLS certificate');
} else { } else {

2
test/network.spec.js
View file

@ -250,6 +250,8 @@ module.exports.describe = function({testRunner, expect, FFOX, CHROMIUM, WEBKIT})
} else if (WEBKIT) { } else if (WEBKIT) {
if (process.platform === 'darwin') if (process.platform === 'darwin')
expect(failedRequests[0].failure().errorText).toBe('The network connection was lost.'); expect(failedRequests[0].failure().errorText).toBe('The network connection was lost.');
else if (process.platform === 'win32')
expect(failedRequests[0].failure().errorText).toBe('Unsupported protocol');
else else
expect(failedRequests[0].failure().errorText).toBe('Message Corrupt'); expect(failedRequests[0].failure().errorText).toBe('Message Corrupt');
} else { } else {