lighthouse 9.5.0-dev.20230121 → 9.5.0-dev.20230123

package/report/test/renderer/{i18n-test.js → i18n-formatter-test.js}

@@ -6,19 +6,13 @@
 
 import assert from 'assert/strict';
 
-import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
-
-// Require i18n to make sure Intl is polyfilled in Node without full-icu for testing.
-// When Util is run in a browser, Intl will be supplied natively (IE11+).
-// eslint-disable-next-line no-unused-vars
-import '../../../core/lib/i18n/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 
 const NBSP = '\xa0';
 
-describe('util helpers', () => {
+describe('i18n formatter', () => {
   it('formats a number', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     assert.strictEqual(i18n.formatNumber(10), '10');
     assert.strictEqual(i18n.formatNumber(100.01), '100.01');
     assert.strictEqual(i18n.formatNumber(13000.456), '13,000.456');
@@ -46,7 +40,7 @@ describe('util helpers', () => {
   });
 
   it('formats a date', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     const timestamp = i18n.formatDateTime('2017-04-28T23:07:51.189Z');
     assert.ok(
       timestamp.includes('Apr 27, 2017') ||
@@ -56,7 +50,7 @@ describe('util helpers', () => {
   });
 
   it('formats bytes', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     assert.equal(i18n.formatBytesToKiB(100), `0.098${NBSP}KiB`);
     assert.equal(i18n.formatBytesToKiB(100, 0.1), `0.1${NBSP}KiB`);
     assert.equal(i18n.formatBytesToKiB(2000, 0.1), `2.0${NBSP}KiB`);
@@ -64,7 +58,7 @@ describe('util helpers', () => {
   });
 
   it('formats bytes with different granularities', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
 
     let granularity = 10;
     assert.strictEqual(i18n.formatBytes(15.0, granularity), `20${NBSP}bytes`);
@@ -88,7 +82,7 @@ describe('util helpers', () => {
   });
 
   it('formats bytes with invalid granularity', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     const granularity = 0.5;
     const originalWarn = console.warn;
 
@@ -103,7 +97,7 @@ describe('util helpers', () => {
   });
 
   it('formats kibibytes with different granularities', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
 
     let granularity = 10;
     assert.strictEqual(i18n.formatBytesToKiB(5 * 1024, granularity), `10${NBSP}KiB`);
@@ -121,7 +115,7 @@ describe('util helpers', () => {
   });
 
   it('formats ms', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     assert.equal(i18n.formatMilliseconds(123, 10), `120${NBSP}ms`);
     assert.equal(i18n.formatMilliseconds(2456.5, 0.1), `2,456.5${NBSP}ms`);
     assert.equal(i18n.formatMilliseconds(0.000001), `0${NBSP}ms`);
@@ -129,21 +123,21 @@ describe('util helpers', () => {
   });
 
   it('formats a duration', () => {
-    const i18n = new I18n('en', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en');
     assert.equal(i18n.formatDuration(60 * 1000), '1m');
     assert.equal(i18n.formatDuration(60 * 60 * 1000 + 5000), '1h 5s');
     assert.equal(i18n.formatDuration(28 * 60 * 60 * 1000 + 5000), '1d 4h 5s');
   });
 
   it('formats a duration based on locale', () => {
-    let i18n = new I18n('de', {...Util.UIStrings});
+    let i18n = new I18nFormatter('de');
     assert.equal(i18n.formatDuration(60 * 1000), `1${NBSP}Min.`);
     assert.equal(i18n.formatDuration(60 * 60 * 1000 + 5000), `1${NBSP}Std. 5${NBSP}Sek.`);
     assert.equal(
       i18n.formatDuration(28 * 60 * 60 * 1000 + 5000), `1${NBSP}T 4${NBSP}Std. 5${NBSP}Sek.`);
 
     // Yes, this is actually backwards (s h d).
-    i18n = new I18n('ar', {...Util.UIStrings});
+    i18n = new I18nFormatter('ar');
     /* eslint-disable no-irregular-whitespace */
     assert.equal(i18n.formatDuration(60 * 1000), `١${NBSP}د`);
     assert.equal(i18n.formatDuration(60 * 60 * 1000 + 5000), `١${NBSP}س ٥${NBSP}ث`);
@@ -155,7 +149,7 @@ describe('util helpers', () => {
     // Requires full-icu or Intl polyfill.
     const number = 12346.858558;
 
-    const i18n = new I18n('de', {...Util.UIStrings});
+    const i18n = new I18nFormatter('de');
     assert.strictEqual(i18n.formatNumber(number), '12.346,859');
     assert.strictEqual(i18n.formatBytesToKiB(number, 0.1), `12,1${NBSP}KiB`);
     assert.strictEqual(i18n.formatMilliseconds(number, 10), `12.350${NBSP}ms`);
@@ -166,7 +160,7 @@ describe('util helpers', () => {
     // Requires full-icu or Intl polyfill.
     const number = 12346.858558;
 
-    const i18n = new I18n('en-XA', {...Util.UIStrings});
+    const i18n = new I18nFormatter('en-XA');
     assert.strictEqual(i18n.formatNumber(number), '12.346,859');
     assert.strictEqual(i18n.formatBytesToKiB(number, 0.1), `12,1${NBSP}KiB`);
     assert.strictEqual(i18n.formatMilliseconds(number, 100), `12.300${NBSP}ms`);
@@ -174,7 +168,7 @@ describe('util helpers', () => {
   });
 
   it('should not crash on unknown locales', () => {
-    const i18n = new I18n('unknown-mystery-locale', {...Util.UIStrings});
+    const i18n = new I18nFormatter('unknown-mystery-locale');
     const timestamp = i18n.formatDateTime('2017-04-28T23:07:51.189Z');
     assert.ok(
       timestamp.includes('Apr 27, 2017') ||

package/report/test/renderer/performance-category-renderer-test.js

@@ -9,7 +9,7 @@ import assert from 'assert/strict';
 import jsdom from 'jsdom';
 
 import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {PerformanceCategoryRenderer} from '../../renderer/performance-category-renderer.js';
@@ -23,7 +23,7 @@ describe('PerfCategoryRenderer', () => {
   let sampleResults;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Util.i18n = new I18nFormatter('en');
 
     const {document} = new jsdom.JSDOM().window;
     const dom = new DOM(document);

package/report/test/renderer/pwa-category-renderer-test.js

@@ -9,7 +9,7 @@ import assert from 'assert/strict';
 import jsdom from 'jsdom';
 
 import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {PwaCategoryRenderer} from '../../renderer/pwa-category-renderer.js';
@@ -23,7 +23,7 @@ describe('PwaCategoryRenderer', () => {
   let sampleResults;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Util.i18n = new I18nFormatter('en');
 
     const {document} = new jsdom.JSDOM().window;
     const dom = new DOM(document);

package/report/test/renderer/snippet-renderer-test.js

@@ -9,7 +9,7 @@ import assert from 'assert/strict';
 import jsdom from 'jsdom';
 
 import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 import {DOM} from '../../renderer/dom.js';
 import {SnippetRenderer} from '../../renderer/snippet-renderer.js';
 
@@ -55,7 +55,7 @@ describe('DetailsRenderer', () => {
   let dom;
 
   before(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Util.i18n = new I18nFormatter('en');
     const {document} = new jsdom.JSDOM().window;
     dom = new DOM(document);
   });

package/report/test/renderer/util-test.js

@@ -7,14 +7,14 @@
 import assert from 'assert/strict';
 
 import {Util} from '../../renderer/util.js';
-import {I18n} from '../../renderer/i18n.js';
+import {I18nFormatter} from '../../renderer/i18n-formatter.js';
 import {readJson} from '../../../core/test/test-utils.js';
 
 const sampleResult = readJson('../../../core/test/results/sample_v2.json', import.meta);
 
 describe('util helpers', () => {
   beforeEach(() => {
-    Util.i18n = new I18n('en', {...Util.UIStrings});
+    Util.i18n = new I18nFormatter('en');
   });
 
   afterEach(() => {