Fix preload, tests and smoketest

GoogleChrome · Jan 16, 2018 · 31c838d · 31c838d
1 parent 8194adc
commit 31c838d
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 9 deletions.
diff --git a/lighthouse-cli/test/fixtures/online-only.html b/lighthouse-cli/test/fixtures/online-only.html
@@ -1,8 +1,10 @@
 <html>
   <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1">
+  <link rel="stylesheet" href="/perf/preload_style.css" />
   <body>
     There was nothing special about this site,
     nothing was left to be seen,
     not even a kite.
+    <script src="/perf/preload_tester.js"></script>
   </body>
 </html>
diff --git a/lighthouse-cli/test/fixtures/perf/level-2.js b/lighthouse-cli/test/fixtures/perf/level-2.js
@@ -0,0 +1,9 @@
+/**
+ * @license Copyright 2017 Google Inc. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+
+/* eslint-disable */
+
+document.write('<script src="level-3.js?delay=500"></script>');
diff --git a/lighthouse-cli/test/fixtures/perf/level-3.js b/lighthouse-cli/test/fixtures/perf/level-3.js
@@ -0,0 +1,12 @@
+/**
+ * @license Copyright 2017 Google Inc. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+
+/* eslint-disable */
+
+const dummyDiv = document.createElement('div');
+dummyDiv.innerHTML = 'Hello!';
+
+document.body.appendChild(dummyDiv);
diff --git a/lighthouse-cli/test/fixtures/perf/lobster-v20-latin-regular.woff2 b/lighthouse-cli/test/fixtures/perf/lobster-v20-latin-regular.woff2
diff --git a/lighthouse-cli/test/fixtures/perf/preload_style.css b/lighthouse-cli/test/fixtures/perf/preload_style.css
@@ -0,0 +1,8 @@
+@font-face {
+  font-family: "Lobster";
+  src: url("./lobster-v20-latin-regular.woff2") format("woff2");
+ }
+
+ body {
+   font-family: "Lobster";
+ }
diff --git a/lighthouse-cli/test/fixtures/perf/preload_tester.js b/lighthouse-cli/test/fixtures/perf/preload_tester.js
@@ -0,0 +1,9 @@
+/**
+ * @license Copyright 2017 Google Inc. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+
+/* eslint-disable */
+
+document.write('<script src="level-2.js"></script>')
diff --git a/lighthouse-cli/test/smokehouse/perf/expectations.js b/lighthouse-cli/test/smokehouse/perf/expectations.js
@@ -36,6 +36,15 @@ module.exports = [
         // Can be flaky, so test float rawValue instead of boolean score
         rawValue: '<1000',
       },
+      'uses-rel-preload': {
+        score: 0,
+        rawValue: '>500',
+        details: {
+          items: {
+            length: 1,
+          },
+        },
+      },
     },
   },
   {

diff --git a/lighthouse-core/audits/uses-rel-preload.js b/lighthouse-core/audits/uses-rel-preload.js
@@ -64,8 +64,9 @@ class UsesRelPreloadAudit extends Audit {
       let maxWasted = 0;
       // get all critical requests 2 + mainResourceIndex levels deep
       const mainResourceIndex = mainResource.redirects ? mainResource.redirects.length : 0;
+
       const criticalRequests = UsesRelPreloadAudit._flattenRequests(critChains,
-        3 + mainResourceIndex,2 + mainResourceIndex);
+        3 + mainResourceIndex, 2 + mainResourceIndex);
       criticalRequests.forEach(request => {
         const networkRecord = request;
         if (!networkRecord._isLinkPreload && networkRecord.protocol !== 'data') {

diff --git a/lighthouse-core/test/audits/uses-rel-preload-test.js b/lighthouse-core/test/audits/uses-rel-preload-test.js
@@ -10,8 +10,11 @@
 
 const UsesRelPreload = require('../../audits/uses-rel-preload.js');
 const assert = require('assert');
+const defaultMainResource = {
+  _endTime: 1,
+};
 
-const mockArtifacts = (networkRecords, mockChain) => {
+const mockArtifacts = (networkRecords, mockChain, mainResource = defaultMainResource) => {
   return {
     devtoolsLogs: {
       [UsesRelPreload.DEFAULT_PASS]: [],
@@ -21,16 +24,23 @@ const mockArtifacts = (networkRecords, mockChain) => {
     },
     requestNetworkRecords: () => networkRecords,
     requestMainResource: () => {
-      return Promise.resolve({
-        _endTime: 1,
-      });
+      return Promise.resolve(mainResource);
     },
   };
 };
 
 describe('Performance: uses-rel-preload audit', () => {
   it(`should suggest preload resource`, () => {
+    const mainResource = Object.assign({}, defaultMainResource, {
+      redirects: [''],
+    });
     const networkRecords = [
+      {
+        requestId: '2',
+        _endTime: 1,
+        _isLinkPreload: false,
+        _url: 'http://www.example.com',
+      },
       {
         requestId: '3',
         _startTime: 10,
@@ -45,17 +55,24 @@ describe('Performance: uses-rel-preload audit', () => {
             children: {
               '3': {
                 request: networkRecords[0],
+                children: {
+                  '4': {
+                    request: networkRecords[1],
+                    children: {},
+                  },
+                },
               },
             },
           },
         },
       },
     };
 
-    return UsesRelPreload.audit(mockArtifacts(networkRecords, chains)).then(output => {
-      assert.equal(output.rawValue, 9000);
-      assert.equal(output.details.items.length, 1);
-    });
+    return UsesRelPreload.audit(mockArtifacts(networkRecords, chains, mainResource))
+      .then(output => {
+        assert.equal(output.rawValue, 9000);
+        assert.equal(output.details.items.length, 1);
+      });
   });
 
   it(`shouldn't suggest preload for already preloaded records`, () => {
@@ -74,6 +91,7 @@ describe('Performance: uses-rel-preload audit', () => {
             children: {
               '3': {
                 request: networkRecords[0],
+                children: {},
               },
             },
           },
@@ -103,6 +121,7 @@ describe('Performance: uses-rel-preload audit', () => {
             children: {
               '3': {
                 request: networkRecords[0],
+                children: {},
               },
             },
           },