From 214fcfc46df90c046fc115b21e333b1676b81cc6 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Mon, 14 Jun 2021 18:55:08 -0700
Subject: [PATCH] test: re-enable some skipped tests (#29655)

* test: re-enable some skipped tests

* test: enable more tests
---
 spec-main/api-browser-window-spec.ts   |  3 +--
 spec-main/api-protocol-spec.ts         | 12 +++++++-----
 spec/fixtures/pages/cache-storage.html |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
index 4eb8ba6d42c6..df764a5bb75f 100644
--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -406,8 +406,7 @@ describe('BrowserWindow module', () => {
       await expect(p).to.eventually.be.fulfilled;
     });
 
-    // FIXME(robo/nornagon): re-enable these once service workers work
-    describe.skip('POST navigations', () => {
+    describe('POST navigations', () => {
       afterEach(() => { w.webContents.session.webRequest.onBeforeSendHeaders(null); });
 
       it('supports specifying POST data', async () => {
diff --git a/spec-main/api-protocol-spec.ts b/spec-main/api-protocol-spec.ts
index 3380412ddb35..119fbe8cf07f 100644
--- a/spec-main/api-protocol-spec.ts
+++ b/spec-main/api-protocol-spec.ts
@@ -754,7 +754,7 @@ describe('protocol module', () => {
     });
   });
 
-  describe.skip('protocol.registerSchemesAsPrivileged standard', () => {
+  describe('protocol.registerSchemesAsPrivileged standard', () => {
     const standardScheme = (global as any).standardScheme;
     const origin = `${standardScheme}://fake-host`;
     const imageURL = `${origin}/test.png`;
@@ -766,7 +766,8 @@ describe('protocol module', () => {
       w = new BrowserWindow({
         show: false,
         webPreferences: {
-          nodeIntegration: true
+          nodeIntegration: true,
+          contextIsolation: false
         }
       });
     });
@@ -834,7 +835,7 @@ describe('protocol module', () => {
     });
   });
 
-  describe.skip('protocol.registerSchemesAsPrivileged cors-fetch', function () {
+  describe('protocol.registerSchemesAsPrivileged cors-fetch', function () {
     const standardScheme = (global as any).standardScheme;
     let w: BrowserWindow = null as unknown as BrowserWindow;
     beforeEach(async () => {
@@ -867,7 +868,8 @@ describe('protocol module', () => {
       });
     });
 
-    it('disallows CORS and fetch requests when only supportFetchAPI is specified', async () => {
+    // FIXME: Figure out why this test is failing
+    it.skip('disallows CORS and fetch requests when only supportFetchAPI is specified', async () => {
       await allowsCORSRequests('no-cors', ['failed xhr', 'failed fetch'], /has been blocked by CORS policy/, () => {
         const { ipcRenderer } = require('electron');
         Promise.all([
@@ -915,7 +917,7 @@ describe('protocol module', () => {
         callback('');
       });
 
-      const newContents: WebContents = (webContents as any).create({ nodeIntegration: true });
+      const newContents: WebContents = (webContents as any).create({ nodeIntegration: true, contextIsolation: false });
       const consoleMessages: string[] = [];
       newContents.on('console-message', (e, level, message) => consoleMessages.push(message));
       try {
diff --git a/spec/fixtures/pages/cache-storage.html b/spec/fixtures/pages/cache-storage.html
index 0b6717201e50..e91cae61546e 100644
--- a/spec/fixtures/pages/cache-storage.html
+++ b/spec/fixtures/pages/cache-storage.html
@@ -1,5 +1,5 @@
 <script>
-  const ipcRenderer = require('electron').ipcRenderer;
+  const { ipcRenderer } = require('electron');
   caches.open('foo').then(
     () => ipcRenderer.send('success'),
     err => ipcRenderer.send('failure', err)