From 7a7ff9e994ee559132b1c716adb4e15661ff1fc4 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Sat, 11 Jan 2020 02:32:28 +0100
Subject: [PATCH] Revert "Revert "feat(firefox): roll Firefox to r1011 (#452)""

This reverts commit a738af46036c6065330bb8e6d5b3006396a763ab.
---
 package.json               | 2 +-
 src/server/ffPlaywright.ts | 2 ++
 test/page.spec.js          | 5 +----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7bbae95ec9..9f8b067f19 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "main": "index.js",
   "playwright": {
     "chromium_revision": "724623",
-    "firefox_revision": "1009",
+    "firefox_revision": "1011",
     "webkit_revision": "1082"
   },
   "scripts": {
diff --git a/src/server/ffPlaywright.ts b/src/server/ffPlaywright.ts
index 5ac8614d71..85d142ad3e 100644
--- a/src/server/ffPlaywright.ts
+++ b/src/server/ffPlaywright.ts
@@ -439,6 +439,8 @@ const DEFAULT_PREFERENCES = {
   // Ensure blocklist updates do not hit the network
   'services.settings.server': `http://${DUMMY_UMA_SERVER}/dummy/blocklist/`,
 
+  'browser.tabs.documentchannel': false,
+
   // Do not automatically fill sign-in forms with known usernames and
   // passwords
   'signon.autofillForms': false,
diff --git a/test/page.spec.js b/test/page.spec.js
index ecad154c40..3a2fcb9be8 100644
--- a/test/page.spec.js
+++ b/test/page.spec.js
@@ -243,10 +243,7 @@ module.exports.describe = function({testRunner, expect, headless, playwright, FF
         page.evaluate(async url => fetch(url).catch(e => {}), server.EMPTY_PAGE)
       ]);
       expect(message.text()).toContain('Access-Control-Allow-Origin');
-      if (CHROME || WEBKIT)
-        expect(message.type()).toEqual('error');
-      else
-        expect(message.type()).toEqual('warn');
+      expect(message.type()).toEqual('error');
     });
     it('should have location for console API calls', async({page, server}) => {
       await page.goto(server.EMPTY_PAGE);