remove audit ability to dynamically set scoreDisplayMode

GoogleChrome · Mar 7, 2018 · f582bfe · f582bfe
1 parent cccf448
commit f582bfe
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 11 deletions.
diff --git a/lighthouse-core/audits/audit.js b/lighthouse-core/audits/audit.js
@@ -115,8 +115,7 @@ class Audit {
       throw new Error(`Audit score for ${audit.meta.name} is > 1`);
     }
 
-    const scoreDisplayMode = result.scoreDisplayMode || audit.meta.scoreDisplayMode ||
-        Audit.SCORING_MODES.BINARY;
+    const scoreDisplayMode = audit.meta.scoreDisplayMode || Audit.SCORING_MODES.BINARY;
 
     return {
       score,

diff --git a/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js b/lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
@@ -118,7 +118,6 @@ class UnusedBytes extends Audit {
       displayValue,
       rawValue: wastedMs,
       score: UnusedBytes.scoreForWastedMs(wastedMs),
-      scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
       extendedInfo: {
         value: {
           wastedMs,

diff --git a/lighthouse-core/audits/byte-efficiency/offscreen-images.js b/lighthouse-core/audits/byte-efficiency/offscreen-images.js
@@ -28,6 +28,7 @@ class OffscreenImages extends ByteEfficiencyAudit {
       name: 'offscreen-images',
       description: 'Offscreen images',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText:
         'Consider lazy-loading offscreen and hidden images to improve page load speed ' +
         'and time to interactive. ' +

diff --git a/lighthouse-core/audits/byte-efficiency/total-byte-weight.js b/lighthouse-core/audits/byte-efficiency/total-byte-weight.js
@@ -22,6 +22,7 @@ class TotalByteWeight extends ByteEfficiencyAudit {
       name: 'total-byte-weight',
       description: 'Avoids enormous network payloads',
       failureDescription: 'Has enormous network payloads',
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText:
         'Large network payloads cost users real money and are highly correlated with ' +
         'long load times. [Learn ' +

diff --git a/lighthouse-core/audits/byte-efficiency/unminified-css.js b/lighthouse-core/audits/byte-efficiency/unminified-css.js
@@ -23,6 +23,7 @@ class UnminifiedCSS extends ByteEfficiencyAudit {
       name: 'unminified-css',
       description: 'Minify CSS',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText: 'Minifying CSS files can reduce network payload sizes. ' +
         '[Learn more](https://developers.google.com/speed/docs/insights/MinifyResources).',
       requiredArtifacts: ['CSSUsage', 'devtoolsLogs'],

diff --git a/lighthouse-core/audits/byte-efficiency/unminified-javascript.js b/lighthouse-core/audits/byte-efficiency/unminified-javascript.js
@@ -30,6 +30,7 @@ class UnminifiedJavaScript extends ByteEfficiencyAudit {
       name: 'unminified-javascript',
       description: 'Minify JavaScript',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText: 'Minifying JavaScript files can reduce payload sizes and script parse time. ' +
         '[Learn more](https://developers.google.com/speed/docs/insights/MinifyResources).',
       requiredArtifacts: ['Scripts', 'devtoolsLogs'],

diff --git a/lighthouse-core/audits/byte-efficiency/unused-css-rules.js b/lighthouse-core/audits/byte-efficiency/unused-css-rules.js
@@ -19,6 +19,7 @@ class UnusedCSSRules extends ByteEfficiencyAudit {
       name: 'unused-css-rules',
       description: 'Unused CSS rules',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText: 'Remove unused rules from stylesheets to reduce unnecessary ' +
           'bytes consumed by network activity. ' +
           '[Learn more](https://developers.google.com/speed/docs/insights/OptimizeCSSDelivery)',

diff --git a/lighthouse-core/audits/byte-efficiency/unused-javascript.js b/lighthouse-core/audits/byte-efficiency/unused-javascript.js
@@ -18,6 +18,7 @@ class UnusedJavaScript extends ByteEfficiencyAudit {
       name: 'unused-javascript',
       description: 'Unused JavaScript',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText: 'Remove unused JavaScript to reduce bytes consumed by network activity.',
       requiredArtifacts: ['JsUsage', 'devtoolsLogs'],
     };

diff --git a/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js b/lighthouse-core/audits/byte-efficiency/uses-optimized-images.js
@@ -23,6 +23,7 @@ class UsesOptimizedImages extends ByteEfficiencyAudit {
       name: 'uses-optimized-images',
       description: 'Optimize images',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText: 'Optimized images load faster and consume less cellular data. ' +
         '[Learn more](https://developers.google.com/web/tools/lighthouse/audits/optimize-images).',
       requiredArtifacts: ['OptimizedImages', 'devtoolsLogs'],

diff --git a/lighthouse-core/audits/byte-efficiency/uses-request-compression.js b/lighthouse-core/audits/byte-efficiency/uses-request-compression.js
@@ -23,6 +23,7 @@ class ResponsesAreCompressed extends ByteEfficiencyAudit {
     return {
       name: 'uses-request-compression',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       description: 'Enable text compression',
       helpText: 'Text-based responses should be served with compression (gzip, deflate or brotli)' +
         ' to minimize total network bytes.' +

diff --git a/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js b/lighthouse-core/audits/byte-efficiency/uses-responsive-images.js
@@ -29,6 +29,7 @@ class UsesResponsiveImages extends ByteEfficiencyAudit {
       name: 'uses-responsive-images',
       description: 'Properly size images',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText:
         'Serve images that are appropriately-sized to save cellular data ' +
         'and improve load time. ' +

diff --git a/lighthouse-core/audits/byte-efficiency/uses-webp-images.js b/lighthouse-core/audits/byte-efficiency/uses-webp-images.js
@@ -23,6 +23,7 @@ class UsesWebPImages extends ByteEfficiencyAudit {
       name: 'uses-webp-images',
       description: 'Serve images in next-gen formats',
       informative: true,
+      scoreDisplayMode: ByteEfficiencyAudit.SCORING_MODES.NUMERIC,
       helpText: 'Image formats like JPEG 2000, JPEG XR, and WebP often provide better ' +
         'compression than PNG or JPEG, which means faster downloads and less data consumption. ' +
         '[Learn more](https://developers.google.com/web/tools/lighthouse/audits/webp).',

diff --git a/lighthouse-core/test/audits/audit-test.js b/lighthouse-core/test/audits/audit-test.js
@@ -61,14 +61,6 @@ describe('Audit', () => {
       assert.throws(_ => Audit._normalizeAuditScore(B, {rawValue: true, score: NaN}), re);
       assert.throws(_ => Audit._normalizeAuditScore(B, {rawValue: true, score: '50'}), re);
     });
-
-    it('picks the scoreDisplayMode returned by an audit if provided', () => {
-      const {scoreDisplayMode} = Audit._normalizeAuditScore(B, {
-        rawValue: true,
-        scoreDisplayMode: Audit.SCORING_MODES.NUMERIC,
-      });
-      assert.equal(scoreDisplayMode, Audit.SCORING_MODES.NUMERIC);
-    });
   });
 
   describe('generateAuditResult', () => {