From 19cac9a0c1011c1a11068d00c685fee3cd0eb0b0 Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Wed, 11 Dec 2019 19:32:07 -0800
Subject: [PATCH] test: rebaseline wk/mac network tests

---
 src/webkit/FrameManager.ts |  2 +-
 test/navigation.spec.js    | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/webkit/FrameManager.ts b/src/webkit/FrameManager.ts
index 548d312c05..37815feaf9 100644
--- a/src/webkit/FrameManager.ts
+++ b/src/webkit/FrameManager.ts
@@ -553,7 +553,7 @@ export class FrameManager extends EventEmitter implements PageDelegate {
   }
 
   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()._onAbortedNewDocumentNavigation('fake-loader-id', request.failure().errorText);
     }
diff --git a/test/navigation.spec.js b/test/navigation.spec.js
index 56ff4bcbcb..d24e58ee17 100644
--- a/test/navigation.spec.js
+++ b/test/navigation.spec.js
@@ -106,24 +106,32 @@ module.exports.addTests = function({testRunner, expect, playwright, FFOX, CHROME
       page.on('requestfailed', request => expect(request).toBeTruthy());
       let error = null;
       await page.goto(httpsServer.EMPTY_PAGE).catch(e => error = e);
-      if (CHROME)
+      if (CHROME) {
         expect(error.message).toContain('net::ERR_CERT_AUTHORITY_INVALID');
-      else if (WEBKIT)
-        expect(error.message).toContain('Unacceptable TLS certificate');
-      else
+      } else if (WEBKIT) {
+        if (process.platform === 'darwin')
+          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');
+      }
     });
     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/2.html', '/empty.html');
       let error = null;
       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');
-      else if (WEBKIT)
-        expect(error.message).toContain('Unacceptable TLS certificate');
-      else
+      } else if (WEBKIT) {
+        if (process.platform === 'darwin')
+          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');
+      }
     });
     xit('should throw if networkidle is passed as an option', async({page, server}) => {
       let error = null;
@@ -136,7 +144,7 @@ module.exports.addTests = function({testRunner, expect, playwright, FFOX, CHROME
       if (CHROME)
         expect(error.message).toContain('net::ERR_CONNECTION_REFUSED');
       else if (WEBKIT)
-        expect(error.message).toContain('Could not connect: Connection refused');
+        expect(error.message).toContain('Could not connect');
       else
         expect(error.message).toContain('NS_ERROR_CONNECTION_REFUSED');
     });