Merge branch 'master' into fix_https_audit

GoogleChrome · Mar 28, 2017 · dfeb982 · dfeb982
2 parents 3990b52 + 476e780
commit dfeb982
Show file tree

Hide file tree

Showing 49 changed files with 1,201 additions and 1,715 deletions.
diff --git a/lighthouse-cli/test/smokehouse/byte-efficiency/expectations.js b/lighthouse-cli/test/smokehouse/byte-efficiency/expectations.js
@@ -24,16 +24,17 @@ module.exports = [
     initialUrl: 'http://localhost:10200/byte-efficiency/tester.html',
     url: 'http://localhost:10200/byte-efficiency/tester.html',
     audits: {
-      'unused-css-rules': {
-        score: false,
-        extendedInfo: {
-          value: {
-            results: {
-              length: 2
-            }
-          }
-        }
-      },
+      // TODO: re-enable once CSS protocol has stabilized
+      // 'unused-css-rules': {
+      //   score: false,
+      //   extendedInfo: {
+      //     value: {
+      //       results: {
+      //         length: 2
+      //       }
+      //     }
+      //   }
+      // },
       'offscreen-images': {
         score: false,
         extendedInfo: {

diff --git a/lighthouse-cli/test/smokehouse/byte-efficiency/run-tests.sh b/lighthouse-cli/test/smokehouse/byte-efficiency/run-tests.sh
@@ -4,7 +4,7 @@ node lighthouse-cli/test/fixtures/static-server.js &
 
 sleep 0.5s
 
-config="lighthouse-core/config/default.json"
+config="lighthouse-core/config/default.js"
 expectations="lighthouse-cli/test/smokehouse/byte-efficiency/expectations.js"
 
 npm run -s smokehouse -- --config-path=$config --expectations-path=$expectations

diff --git a/lighthouse-cli/test/smokehouse/dobetterweb/run-tests.sh b/lighthouse-cli/test/smokehouse/dobetterweb/run-tests.sh
@@ -4,7 +4,7 @@ node lighthouse-cli/test/fixtures/static-server.js &
 
 sleep 0.5s
 
-config="lighthouse-core/config/default.json"
+config="lighthouse-core/config/default.js"
 expectations="lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js"
 
 # run smoketest on DBW test page.

diff --git a/lighthouse-cli/test/smokehouse/offline-local/offline-expectations.js b/lighthouse-cli/test/smokehouse/offline-local/offline-expectations.js
@@ -41,9 +41,6 @@ module.exports = [
       'viewport': {
         score: true
       },
-      'manifest-display': {
-        score: false
-      },
       'without-javascript': {
         score: true
       },
@@ -55,34 +52,13 @@ module.exports = [
         score: true,
         displayValue: '0'
       },
-      'manifest-exists': {
-        score: false
-      },
-      'manifest-background-color': {
-        score: false
-      },
-      'manifest-theme-color': {
-        score: false
-      },
-      'manifest-icons-min-192': {
-        score: false
-      },
-      'manifest-icons-min-144': {
-        score: false
-      },
-      'manifest-name': {
-        score: false
-      },
-      'manifest-short-name': {
-        score: false
-      },
-      'manifest-short-name-length': {
+      'webapp-install-banner': {
         score: false
       },
-      'manifest-start-url': {
+      'splash-screen': {
         score: false
       },
-      'theme-color-meta': {
+      'themed-omnibox': {
         score: false
       },
       'aria-valid-attr': {
@@ -128,9 +104,6 @@ module.exports = [
       'viewport': {
         score: true
       },
-      'manifest-display': {
-        score: false
-      },
       'without-javascript': {
         score: true
       },
@@ -142,34 +115,13 @@ module.exports = [
         score: false,
         displayValue: '1'
       },
-      'manifest-exists': {
-        score: false
-      },
-      'manifest-background-color': {
-        score: false
-      },
-      'manifest-theme-color': {
-        score: false
-      },
-      'manifest-icons-min-192': {
-        score: false
-      },
-      'manifest-icons-min-144': {
-        score: false
-      },
-      'manifest-name': {
-        score: false
-      },
-      'manifest-short-name': {
-        score: false
-      },
-      'manifest-short-name-length': {
+      'webapp-install-banner': {
         score: false
       },
-      'manifest-start-url': {
+      'splash-screen': {
         score: false
       },
-      'theme-color-meta': {
+      'themed-omnibox': {
         score: false
       },
       'aria-valid-attr': {

diff --git a/lighthouse-cli/test/smokehouse/offline-local/run-tests.sh b/lighthouse-cli/test/smokehouse/offline-local/run-tests.sh
@@ -4,7 +4,7 @@ node lighthouse-cli/test/fixtures/static-server.js &
 
 sleep 0.5s
 
-config="lighthouse-core/config/default.json"
+config="lighthouse-core/config/default.js"
 expectations="lighthouse-cli/test/smokehouse/offline-local/offline-expectations.js"
 
 # run smoketest, expecting results found in offline-expectations

diff --git a/lighthouse-cli/test/smokehouse/pwa-config.js b/lighthouse-cli/test/smokehouse/pwa-config.js
@@ -25,6 +25,7 @@ module.exports = {
     recordTrace: true,
     gatherers: [
       'url',
+      'theme-color',
       'manifest',
       // https://github.com/GoogleChrome/lighthouse/issues/566
       // 'cache-contents'
@@ -51,15 +52,9 @@ module.exports = {
     'redirects-http',
     'service-worker',
     'works-offline',
-    'manifest-display',
-    'manifest-exists',
-    'manifest-background-color',
-    'manifest-theme-color',
-    'manifest-icons-min-192',
-    'manifest-icons-min-144',
-    'manifest-name',
-    'manifest-short-name',
-    'manifest-start-url',
+    'webapp-install-banner',
+    'splash-screen',
+    'themed-omnibox',
     // https://github.com/GoogleChrome/lighthouse/issues/566
     // 'cache-start-url'
   ],

diff --git a/lighthouse-cli/test/smokehouse/pwa-expectations.js b/lighthouse-cli/test/smokehouse/pwa-expectations.js
@@ -37,35 +37,13 @@ module.exports = [
       'works-offline': {
         score: true
       },
-      'manifest-display': {
-        score: true,
-        displayValue: 'standalone'
-      },
-      'manifest-exists': {
+      'webapp-install-banner': {
         score: true
       },
-      'manifest-background-color': {
-        score: true,
-        extendedInfo: {
-          value: '#2196F3'
-        }
-      },
-      'manifest-theme-color': {
+      'splash-screen': {
         score: true
       },
-      'manifest-icons-min-192': {
-        score: true
-      },
-      'manifest-icons-min-144': {
-        score: true
-      },
-      'manifest-name': {
-        score: true
-      },
-      'manifest-short-name': {
-        score: true
-      },
-      'manifest-start-url': {
+      'themed-omnibox': {
         score: true
       },
       // 'cache-start-url': {
@@ -99,35 +77,13 @@ module.exports = [
       'works-offline': {
         score: false
       },
-      'manifest-display': {
-        score: true,
-        displayValue: 'standalone'
-      },
-      'manifest-exists': {
+      'webapp-install-banner': {
         score: true
       },
-      'manifest-background-color': {
-        score: true,
-        extendedInfo: {
-          value: '#366597'
-        }
-      },
-      'manifest-theme-color': {
-        score: true
-      },
-      'manifest-icons-min-192': {
-        score: true
-      },
-      'manifest-icons-min-144': {
+      'splash-screen': {
         score: true
       },
-      'manifest-name': {
-        score: true
-      },
-      'manifest-short-name': {
-        score: true
-      },
-      'manifest-start-url': {
+      'themed-omnibox': {
         score: true
       },
       // 'cache-start-url': {
@@ -152,37 +108,13 @@ module.exports = [
       'works-offline': {
         score: true
       },
-      'manifest-display': {
-        score: true,
-        displayValue: 'standalone'
-      },
-      'manifest-exists': {
-        score: true
-      },
-      'manifest-background-color': {
-        score: true,
-        extendedInfo: {
-          value: '#bababa'
-        }
-      },
-      'manifest-theme-color': {
-        score: true
-      },
-      'manifest-icons-min-192': {
-        score: true,
-        displayValue: 'found sizes: 600x600',
-      },
-      'manifest-icons-min-144': {
-        score: true,
-        displayValue: 'found sizes: 600x600',
-      },
-      'manifest-name': {
-        score: true
+      'webapp-install-banner': {
+        score: false
       },
-      'manifest-short-name': {
+      'splash-screen': {
         score: true
       },
-      'manifest-start-url': {
+      'themed-omnibox': {
         score: true
       },
       // 'cache-start-url': {
@@ -260,36 +192,14 @@ module.exports = [
       'works-offline': {
         score: true
       },
-      'manifest-display': {
-        score: true,
-        displayValue: 'standalone'
-      },
-      'manifest-exists': {
-        score: true
-      },
-      'manifest-background-color': {
-        score: true,
-        extendedInfo: {
-          value: '#383838'
-        }
-      },
-      'manifest-theme-color': {
-        score: true
-      },
-      'manifest-icons-min-192': {
-        score: true
-      },
-      'manifest-icons-min-144': {
+      'webapp-install-banner': {
         score: true
       },
-      'manifest-name': {
-        score: true
-      },
-      'manifest-short-name': {
-        score: true
+      'splash-screen': {
+        score: false
       },
-      'manifest-start-url': {
-        score: true
+      'themed-omnibox': {
+        score: false
       },
       // 'cache-start-url': {
       //   score: true