Adjust loader for trace files

GoogleChrome · Jul 27, 2016 · 18bebe0 · 18bebe0
1 parent bfd880d
commit 18bebe0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/lighthouse-core/config/index.js b/lighthouse-core/config/index.js
@@ -100,8 +100,13 @@ function expandArtifacts(artifacts) {
   const expandedArtifacts = Object.assign({}, artifacts);
 
   // currently only trace logs and performance logs should be imported
-  if (artifacts.traceContents) {
-    expandedArtifacts.traceContents = require(artifacts.traceContents);
+  if (artifacts.traces) {
+    Object.keys(artifacts.traces).forEach(key => {
+      if (artifacts.traces[key].traceContents) {
+        expandedArtifacts.traces[key].traceContents =
+          require(artifacts.traces[key].traceContents);
+      }
+    });
   }
   if (artifacts.performanceLog) {
     expandedArtifacts.CriticalRequestChains =

diff --git a/lighthouse-core/test/config/index.js b/lighthouse-core/test/config/index.js
@@ -130,12 +130,16 @@ describe('Config', () => {
   it('expands artifacts', () => {
     const config = new Config({
       artifacts: {
-        traceContents: path.resolve(__dirname, '../fixtures/traces/trace-user-timings.json'),
+        traces: {
+          firstPass: {
+            traceContents: path.resolve(__dirname, '../fixtures/traces/trace-user-timings.json')
+          }
+        },
         performanceLog: path.resolve(__dirname, '../fixtures/perflog.json')
       }
     });
     const traceUserTimings = require('../fixtures/traces/trace-user-timings.json');
-    assert.deepStrictEqual(config.artifacts.traceContents, traceUserTimings);
+    assert.deepStrictEqual(config.artifacts.traces.firstPass.traceContents, traceUserTimings);
     assert.ok(config.artifacts.CriticalRequestChains);
     assert.ok(config.artifacts.CriticalRequestChains['93149.1']);
     assert.ok(config.artifacts.CriticalRequestChains['93149.1'].request);

diff --git a/lighthouse-core/test/runner.js b/lighthouse-core/test/runner.js
@@ -86,8 +86,12 @@ describe('Runner', () => {
       ],
 
       artifacts: {
-        traceContents: path.join(__dirname,
+        traces: {
+          firstPass: {
+            traceContents: path.join(__dirname,
                            '/fixtures/traces/trace-user-timings.json')
+          }
+        }
       }
     }, flags.auditWhitelist);