Remove 'Coming Soon' results from report (#1637)

GoogleChrome · Feb 7, 2017 · ea5466c · ea5466c
1 parent 76fb69e
commit ea5466c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 217 deletions.
diff --git a/lighthouse-cli/printer.ts b/lighthouse-cli/printer.ts
@@ -107,9 +107,6 @@ function createOutput(results: Results, outputMode: OutputMode): string {
           auditResult = subitem as AuditResult;
         }
 
-        if (auditResult.comingSoon === true)
-          return;
-
         const formattedScore = auditResult.error ? `${log.redify('‽')}` :
             `${formatAggregationResultItem(auditResult.score)}`;
         let lineItem = ` ${log.doubleLightHorizontal} ${formattedScore} ${auditResult.description}`;

diff --git a/lighthouse-cli/test/fixtures/sample.json b/lighthouse-cli/test/fixtures/sample.json
@@ -470,28 +470,7 @@
             "first-meaningful-paint",
             "speed-index-metric",
             "estimated-input-latency",
-            "time-to-interactive",
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Content scrolls at 60fps",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Touch input gets a response in < 150ms",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "App is interactive without jank after the first meaningful paint",
-              "comingSoon": true
-            }
+            "time-to-interactive"
           ]
         },
         {
@@ -572,42 +551,7 @@
             "image-alt",
             "label",
             "manifest-short-name-length",
-            "manifest-display",
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Service worker makes use of push notifications, if appropriate",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Tap targets are appropriately sized for touch",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Payment forms marked up with [autocomplete] attributes",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Login forms marked up with [autocomplete] attributes",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Input fields use appropriate [type] attributes for custom keyboards",
-              "comingSoon": true
-            }
+            "manifest-display"
           ]
         }
       ]

diff --git a/lighthouse-cli/types/types.ts b/lighthouse-cli/types/types.ts
@@ -1,7 +1,6 @@
 interface AuditResult {
   displayValue: string;
   debugString: string;
-  comingSoon?: boolean;
   score: number;
   error?: boolean;
   description: string;

diff --git a/lighthouse-core/aggregator/aggregate.js b/lighthouse-core/aggregator/aggregate.js
@@ -168,20 +168,6 @@ class Aggregate {
       // Step through each item in the expected results, and add them
       // to the overall score and add each to the subItems list.
       expectedNames.forEach(e => {
-        /* istanbul ignore if */
-        // TODO(paullewis): Remove once coming soon audits have landed
-        if (item.audits[e].comingSoon) {
-          subItems.push({
-            score: '¯\\_(ツ)_/¯',
-            name: 'coming-soon',
-            category: item.audits[e].category,
-            description: item.audits[e].description,
-            comingSoon: true
-          });
-
-          return;
-        }
-
         if (!filteredAndRemappedResults[e]) {
           throw new Error(`aggregations: expected audit results not found under audit name ${e}`);
         }

diff --git a/lighthouse-core/closure/typedefs/Aggregation.js b/lighthouse-core/closure/typedefs/Aggregation.js
@@ -32,9 +32,6 @@ AggregationCriterion.prototype.rawValue;
 /** @type {number} */
 AggregationCriterion.prototype.weight;
 
-/** @type {boolean|undefined} */
-AggregationCriterion.prototype.comingSoon;
-
 /** @type {string|undefined} */
 AggregationCriterion.prototype.category;
 

diff --git a/lighthouse-core/config/default.json b/lighthouse-core/config/default.json
@@ -138,27 +138,6 @@
         "time-to-interactive": {
           "expectedValue": 100,
           "weight": 1
-        },
-        "scrolling-60fps": {
-          "expectedValue": true,
-          "weight": 0,
-          "comingSoon": true,
-          "description": "Content scrolls at 60fps",
-          "category": "UX"
-        },
-        "touch-150ms": {
-          "expectedValue": true,
-          "weight": 0,
-          "comingSoon": true,
-          "description": "Touch input gets a response in < 150ms",
-          "category": "UX"
-        },
-        "fmp-no-jank": {
-          "expectedValue": true,
-          "weight": 0,
-          "comingSoon": true,
-          "description": "App is interactive without jank after the first meaningful paint",
-          "category": "UX"
         }
       }
     }, {
@@ -389,41 +368,6 @@
         "manifest-display": {
           "expectedValue": true,
           "weight": 1
-        },
-        "serviceworker-push": {
-          "expectedValue": true,
-          "weight": 0,
-          "comingSoon": true,
-          "description": "Service worker makes use of push notifications, if appropriate",
-          "category": "UX"
-        },
-        "tap-targets": {
-          "expectedValue": true,
-          "weight": 0,
-          "comingSoon": true,
-          "description": "Tap targets are appropriately sized for touch",
-          "category": "UX"
-        },
-        "payments-autocomplete": {
-          "expectedValue": true,
-          "weight": 0,
-          "comingSoon": true,
-          "description": "Payment forms marked up with `autocomplete` attributes",
-          "category": "UX"
-        },
-        "login-autocomplete": {
-          "expectedValue": true,
-          "weight": 0,
-          "comingSoon": true,
-          "description": "Login forms marked up with `autocomplete` attributes",
-          "category": "UX"
-        },
-        "input-type": {
-          "expectedValue": true,
-          "weight": 0,
-          "comingSoon": true,
-          "description": "Input fields use appropriate `type` attributes for custom keyboards",
-          "category": "UX"
         }
       }
     }]

diff --git a/lighthouse-core/report/styles/report.css b/lighthouse-core/report/styles/report.css
@@ -32,7 +32,6 @@ span, div, p, section, header, h1, h2, li, ul {
   --poor-color: #eb211e;
   --good-color: #1ac123;
   --average-color: #ffae00;
-  --unknown-color: #b3b3b3;
   --warning-color: #f6be00;
   --gutter-gap: 12px;
   --gutter-width: 40px;
@@ -620,14 +619,6 @@ body {
   color: #999;
 }
 
-.coming-soon, .coming-soon * {
-  color: #aaa;
-}
-
-.coming-soon .report-section__item-value {
-  font-size: 70%;
-}
-
 .devtabs {
   flex: 0 1 auto;
   background: right 0 / auto 27px no-repeat url(tabs_right.png),
@@ -732,10 +723,6 @@ body {
   margin-top: calc(var(--subitem-line-height) / 2);
 }
 
-.subitem.--coming-soon {
-  color: var(--secondary-text-color);
-}
-
 .subitem strong {
   font-weight: 700;
 }
@@ -900,9 +887,6 @@ body {
 .score-warning-bg {
   background-color: var(--warning-color);
 }
-.score-unknown-bg {
-  background-color: var(--unknown-color);
-}
 
 .export-section {
   position: relative;

diff --git a/lighthouse-core/report/templates/report-template.html b/lighthouse-core/report/templates/report-template.html
@@ -150,7 +150,7 @@ <h2>{{ aggregation.name }}</h2>
 
             <ul class="subitems">
               {{#each aggregation.subItems as |subItem| }}
-                <li class="subitem {{#if subItem.comingSoon}}--coming-soon{{/if}} {{#if (shouldShowHelpText subItem.score)}}--show-help{{/if}}">
+                <li class="subitem {{#if (shouldShowHelpText subItem.score)}}--show-help{{/if}}">
 
                   <p class="subitem__desc">
                     <!--{{#unless ../../scored }}
@@ -167,10 +167,6 @@ <h2>{{ aggregation.name }}</h2>
                       <small>(target: {{ subItem.optimalValue }})</small>
                     {{/if}}
 
-                    {{#if subItem.comingSoon}}
-                      <small class="subitem__tease">(Coming soon)</small>
-                    {{/if}}
-
                     {{#if subItem.helpText }}
                       <input type="checkbox" class="subitem__help-toggle" title="Toggle help text">
                       <label class="subitem__help-toggle-label"></label>
@@ -187,9 +183,7 @@ <h2>{{ aggregation.name }}</h2>
                   {{/if}}
 
                   <div class="subitem-result">
-                    {{#if subItem.comingSoon}}
-                          <span class="subitem-result__unknown score-unknown-bg">N/A</span>
-                    {{else if subItem.error}}
+                    {{#if subItem.error}}
                       <span class="subitem-result__unknown score-warning-bg">N/A</span>
                     {{else}}
                       {{#if (is-bool subItem.score)}}

diff --git a/lighthouse-core/test/results/sample.json b/lighthouse-core/test/results/sample.json
@@ -858,28 +858,7 @@
             "first-meaningful-paint",
             "speed-index-metric",
             "estimated-input-latency",
-            "time-to-interactive",
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Content scrolls at 60fps",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Touch input gets a response in < 150ms",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "App is interactive without jank after the first meaningful paint",
-              "comingSoon": true
-            }
+            "time-to-interactive"
           ]
         },
         {
@@ -1011,42 +990,7 @@
           "name": "Other",
           "subItems": [
             "manifest-short-name-length",
-            "manifest-display",
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Service worker makes use of push notifications, if appropriate",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Tap targets are appropriately sized for touch",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Payment forms marked up with [autocomplete] attributes",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Login forms marked up with [autocomplete] attributes",
-              "comingSoon": true
-            },
-            {
-              "score": "¯\\_(ツ)_/¯",
-              "name": "coming-soon",
-              "category": "UX",
-              "description": "Input fields use appropriate [type] attributes for custom keyboards",
-              "comingSoon": true
-            }
+            "manifest-display"
           ]
         }
       ]