From 5de6adfb847c77f423125f91beb81192d0893cf7 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 3 Jun 2020 16:56:28 +0900
Subject: [PATCH] test: load page with some content when testing extension
 (#23901)

* test: load page with some content when testing extension

* test: use dom-ready to wait for page loaded with extension
---
 spec-main/extensions-spec.ts                  | 24 ++++++++++++-------
 .../extensions/chrome-runtime/manifest.json   |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/spec-main/extensions-spec.ts b/spec-main/extensions-spec.ts
index 3f7020a6c927..1d43f0d648c4 100644
--- a/spec-main/extensions-spec.ts
+++ b/spec-main/extensions-spec.ts
@@ -10,11 +10,13 @@ import { emittedOnce, emittedNTimes } from './events-helpers';
 const fixtures = path.join(__dirname, 'fixtures');
 
 describe('chrome extensions', () => {
+  const emptyPage = '<script>console.log("loaded")</script>';
+
   // NB. extensions are only allowed on http://, https:// and ftp:// (!) urls by default.
   let server: http.Server;
   let url: string;
   before(async () => {
-    server = http.createServer((req, res) => res.end());
+    server = http.createServer((req, res) => res.end(emptyPage));
     await new Promise(resolve => server.listen(0, '127.0.0.1', () => {
       url = `http://127.0.0.1:${(server.address() as AddressInfo).port}`;
       resolve();
@@ -38,7 +40,8 @@ describe('chrome extensions', () => {
     const customSession = session.fromPartition(`persist:${require('uuid').v4()}`);
     await customSession.loadExtension(path.join(fixtures, 'extensions', 'red-bg'));
     const w = new BrowserWindow({ show: false, webPreferences: { session: customSession } });
-    await w.loadURL(url);
+    w.loadURL(url);
+    await emittedOnce(w.webContents, 'dom-ready');
     const bg = await w.webContents.executeJavaScript('document.documentElement.style.backgroundColor');
     expect(bg).to.equal('red');
   });
@@ -92,7 +95,8 @@ describe('chrome extensions', () => {
     const customSession = session.fromPartition(`persist:${require('uuid').v4()}`);
     await customSession.loadExtension(path.join(fixtures, 'extensions', 'red-bg'));
     const w = new BrowserWindow({ show: false }); // not in the session
-    await w.loadURL(url);
+    w.loadURL(url);
+    await emittedOnce(w.webContents, 'dom-ready');
     const bg = await w.webContents.executeJavaScript('document.documentElement.style.backgroundColor');
     expect(bg).to.equal('');
   });
@@ -115,7 +119,8 @@ describe('chrome extensions', () => {
       const customSession = session.fromPartition(`persist:${require('uuid').v4()}`);
       extension = await customSession.loadExtension(path.join(fixtures, 'extensions', 'chrome-i18n'));
       w = new BrowserWindow({ show: false, webPreferences: { session: customSession, nodeIntegration: true } });
-      await w.loadURL(url);
+      w.loadURL(url);
+      await emittedOnce(w.webContents, 'dom-ready');
     });
     it('getAcceptLanguages()', async () => {
       const result = await exec('getAcceptLanguages');
@@ -132,10 +137,11 @@ describe('chrome extensions', () => {
     let content: any;
     before(async () => {
       const customSession = session.fromPartition(`persist:${require('uuid').v4()}`);
-      customSession.loadExtension(path.join(fixtures, 'extensions', 'chrome-runtime'));
+      await customSession.loadExtension(path.join(fixtures, 'extensions', 'chrome-runtime'));
       const w = new BrowserWindow({ show: false, webPreferences: { session: customSession } });
       try {
-        await w.loadURL(url);
+        w.loadURL(url);
+        await emittedOnce(w.webContents, 'dom-ready');
         content = JSON.parse(await w.webContents.executeJavaScript('document.documentElement.textContent'));
         expect(content).to.be.an('object');
       } finally {
@@ -484,7 +490,8 @@ describe('chrome extensions', () => {
     it('loads a ui page of an extension', async () => {
       const { id } = await session.defaultSession.loadExtension(path.join(fixtures, 'extensions', 'ui-page'));
       const w = new BrowserWindow({ show: false });
-      await w.loadURL(`chrome-extension://${id}/bare-page.html`);
+      w.loadURL(`chrome-extension://${id}/bare-page.html`);
+      await emittedOnce(w.webContents, 'dom-ready');
       const textContent = await w.webContents.executeJavaScript('document.body.textContent');
       expect(textContent).to.equal('ui page loaded ok\n');
     });
@@ -492,7 +499,8 @@ describe('chrome extensions', () => {
     it('can load resources', async () => {
       const { id } = await session.defaultSession.loadExtension(path.join(fixtures, 'extensions', 'ui-page'));
       const w = new BrowserWindow({ show: false });
-      await w.loadURL(`chrome-extension://${id}/page-script-load.html`);
+      w.loadURL(`chrome-extension://${id}/page-script-load.html`);
+      await emittedOnce(w.webContents, 'dom-ready');
       const textContent = await w.webContents.executeJavaScript('document.body.textContent');
       expect(textContent).to.equal('script loaded ok\n');
     });
diff --git a/spec-main/fixtures/extensions/chrome-runtime/manifest.json b/spec-main/fixtures/extensions/chrome-runtime/manifest.json
index 3428ef156ebe..c73d0a5df515 100644
--- a/spec-main/fixtures/extensions/chrome-runtime/manifest.json
+++ b/spec-main/fixtures/extensions/chrome-runtime/manifest.json
@@ -5,7 +5,7 @@
     {
       "matches": ["<all_urls>"],
       "js": ["main.js"],
-      "run_at": "document_start"
+      "run_at": "document_end"
     }
   ],
   "manifest_version": 2