core(jsdom): upgrade jsdom to support closest

GoogleChrome · Oct 26, 2018 · 28cc931 · 28cc931
1 parent 77c85eb
commit 28cc931
Show file tree

Hide file tree

Showing 18 changed files with 200,266 additions and 1,385 deletions.
diff --git a/lighthouse-core/test/lib/page-functions-test.js b/lighthouse-core/test/lib/page-functions-test.js
@@ -16,7 +16,7 @@ describe('DetailsRenderer', () => {
   let dom;
 
   beforeAll(() => {
-    const document = jsdom.jsdom();
+    const {document} = new jsdom.JSDOM().window;
     dom = new DOM(document);
   });
 

diff --git a/lighthouse-core/test/report/html/renderer/category-renderer-test.js b/lighthouse-core/test/report/html/renderer/category-renderer-test.js
@@ -31,7 +31,7 @@ describe('CategoryRenderer', () => {
     global.Util = Util;
     global.CriticalRequestChainRenderer = CriticalRequestChainRenderer;
 
-    const document = jsdom.jsdom(TEMPLATE_FILE);
+    const {document} = new jsdom.JSDOM(TEMPLATE_FILE).window;
     const dom = new DOM(document);
     const detailsRenderer = new DetailsRenderer(dom);
     renderer = new CategoryRenderer(dom, detailsRenderer);
@@ -251,7 +251,8 @@ describe('CategoryRenderer', () => {
   it('can set a custom templateContext', () => {
     assert.equal(renderer.templateContext, renderer.dom.document());
 
-    const otherDocument = jsdom.jsdom(TEMPLATE_FILE);
+    const dom = new jsdom.JSDOM(TEMPLATE_FILE);
+    const otherDocument = dom.window.document;
     renderer.setTemplateContext(otherDocument);
     assert.equal(renderer.templateContext, otherDocument);
   });

diff --git a/lighthouse-core/test/report/html/renderer/crc-details-renderer-test.js b/lighthouse-core/test/report/html/renderer/crc-details-renderer-test.js
@@ -80,7 +80,7 @@ describe('DetailsRenderer', () => {
   beforeAll(() => {
     global.URL = URL;
     global.Util = Util;
-    const document = jsdom.jsdom(TEMPLATE_FILE);
+    const {document} = new jsdom.JSDOM(TEMPLATE_FILE).window;
     dom = new DOM(document);
   });
 

diff --git a/lighthouse-core/test/report/html/renderer/details-renderer-test.js b/lighthouse-core/test/report/html/renderer/details-renderer-test.js
@@ -24,7 +24,7 @@ describe('DetailsRenderer', () => {
   beforeAll(() => {
     global.URL = URL;
     global.Util = Util;
-    const document = jsdom.jsdom(TEMPLATE_FILE);
+    const {document} = new jsdom.JSDOM(TEMPLATE_FILE).window;
     const dom = new DOM(document);
     renderer = new DetailsRenderer(dom);
   });

diff --git a/lighthouse-core/test/report/html/renderer/dom-test.js b/lighthouse-core/test/report/html/renderer/dom-test.js
@@ -21,7 +21,7 @@ describe('DOM', () => {
 
   beforeAll(() => {
     global.URL = URL;
-    const document = jsdom.jsdom(TEMPLATE_FILE);
+    const {document} = new jsdom.JSDOM(TEMPLATE_FILE).window;
     dom = new DOM(document);
   });
 

diff --git a/lighthouse-core/test/report/html/renderer/performance-category-renderer-test.js b/lighthouse-core/test/report/html/renderer/performance-category-renderer-test.js
@@ -36,7 +36,7 @@ describe('PerfCategoryRenderer', () => {
     const PerformanceCategoryRenderer =
         require('../../../../report/html/renderer/performance-category-renderer.js');
 
-    const document = jsdom.jsdom(TEMPLATE_FILE);
+    const {document} = new jsdom.JSDOM(TEMPLATE_FILE).window;
     const dom = new DOM(document);
     const detailsRenderer = new DetailsRenderer(dom);
     renderer = new PerformanceCategoryRenderer(dom, detailsRenderer);

diff --git a/lighthouse-core/test/report/html/renderer/psi-test.js b/lighthouse-core/test/report/html/renderer/psi-test.js
@@ -44,7 +44,8 @@ describe('DOM', () => {
     global.PerformanceCategoryRenderer = PerformanceCategoryRenderer;
     global.CriticalRequestChainRenderer = CriticalRequestChainRenderer;
 
-    document = jsdom.jsdom(TEMPLATE_FILE);
+    const {window} = new jsdom.JSDOM(TEMPLATE_FILE);
+    document = window.document;
   });
 
   afterAll(() => {

diff --git a/lighthouse-core/test/report/html/renderer/report-renderer-test.js b/lighthouse-core/test/report/html/renderer/report-renderer-test.js
@@ -51,10 +51,10 @@ describe('ReportRenderer', () => {
       };
     };
 
-    const document = jsdom.jsdom(TEMPLATE_FILE);
-    global.self = document.defaultView;
+    const {window} = new jsdom.JSDOM(TEMPLATE_FILE);
+    global.self = window;
 
-    const dom = new DOM(document);
+    const dom = new DOM(window.document);
     const detailsRenderer = new DetailsRenderer(dom);
     const categoryRenderer = new CategoryRenderer(dom, detailsRenderer);
     renderer = new ReportRenderer(dom, categoryRenderer);
@@ -149,7 +149,8 @@ describe('ReportRenderer', () => {
   it('can set a custom templateContext', () => {
     assert.equal(renderer._templateContext, renderer._dom.document());
 
-    const otherDocument = jsdom.jsdom(TEMPLATE_FILE);
+    const {window} = new jsdom.JSDOM(TEMPLATE_FILE);
+    const otherDocument = window.document;
     renderer.setTemplateContext(otherDocument);
     assert.equal(renderer._templateContext, otherDocument);
   });

diff --git a/lighthouse-core/test/report/html/renderer/report-ui-features-test.js b/lighthouse-core/test/report/html/renderer/report-ui-features-test.js
@@ -53,9 +53,9 @@ describe('ReportUIFeatures', () => {
       };
     };
 
-    const document = jsdom.jsdom(TEMPLATE_FILE);
-    const documentReport = jsdom.jsdom(TEMPLATE_FILE_REPORT);
-    global.self = document.defaultView;
+    const document = new jsdom.JSDOM(TEMPLATE_FILE);
+    const documentReport = new jsdom.JSDOM(TEMPLATE_FILE_REPORT);
+    global.self = document.window;
     global.self.matchMedia = function() {
       return {
         addListener: function() {},
@@ -70,8 +70,8 @@ describe('ReportUIFeatures', () => {
       };
     };
 
-    const dom = new DOM(document);
-    const dom2 = new DOM(documentReport);
+    const dom = new DOM(document.window.document);
+    const dom2 = new DOM(documentReport.window.document);
     const detailsRenderer = new DetailsRenderer(dom);
     const categoryRenderer = new CategoryRenderer(dom, detailsRenderer);
     renderer = new ReportRenderer(dom, categoryRenderer);

diff --git a/lighthouse-core/test/report/report-generator-test.js b/lighthouse-core/test/report/report-generator-test.js
@@ -53,10 +53,10 @@ describe('ReportGenerator', () => {
     });
 
     it('should inject the report templates', () => {
-      const page = jsdom.jsdom(ReportGenerator.generateReportHtml({}));
-      const templates = jsdom.jsdom(TEMPLATES_FILE);
-      assert.equal(page.querySelectorAll('template[id^="tmpl-"]').length,
-          templates.querySelectorAll('template[id^="tmpl-"]').length, 'all templates injected');
+      const page = new jsdom.JSDOM(ReportGenerator.generateReportHtml({}));
+      const templates = new jsdom.JSDOM(TEMPLATES_FILE);
+      assert.equal(page.window.document.querySelectorAll('template[id^="tmpl-"]').length,
+          templates.window.document.querySelectorAll('template[id^="tmpl-"]').length, 'all templates injected');
     });
 
     it('should inject the report CSS', () => {