core(test): move regenerated fixtures to new folders

core/test/audits/mainthread-work-breakdown-test.js

@@ -10,9 +10,9 @@ import PageExecutionTimings from '../../audits/mainthread-work-breakdown.js';
 import {readJson} from '../test-utils.js';
 
 const acceptableTrace = readJson('../fixtures/traces/progressive-app-m60.json', import.meta);
-const siteWithRedirectTrace = readJson('../fixtures/traces/site-with-redirect.json', import.meta);
+const siteWithRedirectTrace = readJson('../fixtures/artifacts/redirect/trace.json', import.meta);
 const loadTraceOld = readJson('../fixtures/traces/load.json', import.meta);
-const loadTrace = readJson('../fixtures/traces/animation.json', import.meta);
+const loadTrace = readJson('../fixtures/artifacts/animation/trace.json', import.meta);
 const errorTrace = readJson('../fixtures/traces/no_fmp_event.json', import.meta);
 
 const options = PageExecutionTimings.defaultOptions;

core/test/audits/metrics/interactive-test.js

@@ -12,8 +12,8 @@ import {readJson} from '../../test-utils.js';
 
 const acceptableTrace = readJson('../../fixtures/traces/progressive-app-m60.json', import.meta);
 const acceptableDevToolsLog = readJson('../../fixtures/traces/progressive-app-m60.devtools.log.json', import.meta);
-const redirectTrace = readJson('../../fixtures/traces/site-with-redirect.json', import.meta);
-const redirectDevToolsLog = readJson('../../fixtures/traces/site-with-redirect.devtools.log.json', import.meta);
+const redirectTrace = readJson('../../fixtures/artifacts/redirect/trace.json', import.meta);
+const redirectDevToolsLog = readJson('../../fixtures/artifacts/redirect/devtoolslog.json', import.meta);
 
 const options = Interactive.defaultOptions;
 

core/test/audits/third-party-facades-test.js

@@ -11,8 +11,8 @@ import {getURLArtifactFromDevtoolsLog, readJson} from '../test-utils.js';
 
 const pwaTrace = readJson('../fixtures/traces/progressive-app-m60.json', import.meta);
 const pwaDevtoolsLog = readJson('../fixtures/traces/progressive-app-m60.devtools.log.json', import.meta);
-const videoEmbedsTrace = readJson('../fixtures/traces/video-embeds-m84.json', import.meta);
-const videoEmbedsDevtolsLog = readJson('../fixtures/traces/video-embeds-m84.devtools.log.json', import.meta);
+const videoEmbedsTrace = readJson('../fixtures/artifacts/video-embed/trace.json', import.meta);
+const videoEmbedsDevtolsLog = readJson('../fixtures/artifacts/video-embed/devtoolslog.json', import.meta);
 const noThirdPartyTrace = readJson('../fixtures/traces/no-tracingstarted-m74.json', import.meta);
 
 function intercomProductUrl(id) {

core/test/audits/user-timing-test.js

@@ -9,7 +9,7 @@ import assert from 'assert/strict';
 import UserTimingsAudit from '../../audits/user-timings.js';
 import {readJson} from '../test-utils.js';
 
-const trace = readJson('../fixtures/traces/trace-user-timings.json', import.meta);
+const trace = readJson('../fixtures/artifacts/user-timing/trace.json', import.meta);
 
 function generateArtifactsWithTrace(trace) {
   return {

core/test/fixtures/artifacts/animation/regenerate.js

@@ -35,7 +35,7 @@ function verify(artifacts) {
 await updateTestFixture({
   name: 'animation',
   about: 'Page with an animated elements that are composited and non-composited',
-  saveTrace: 'animation.json',
+  saveTrace: true,
   saveDevtoolsLog: false,
   runUserFlow,
   verify,

core/test/fixtures/artifacts/redirect/regenerate.js

@@ -47,8 +47,8 @@ function verify(artifacts) {
 await updateTestFixture({
   name: 'redirect',
   about: 'Page with a multiple navigation-initiated redirects and a JS reload',
-  saveTrace: 'site-with-redirect.json',
-  saveDevtoolsLog: 'site-with-redirect.devtools.log.json',
+  saveTrace: true,
+  saveDevtoolsLog: true,
   runUserFlow,
   verify,
 });

core/test/fixtures/artifacts/update-test-fixture.js

@@ -18,19 +18,18 @@ import {saveTrace, saveDevtoolsLog} from '../../../lib/asset-saver.js';
  * @property {string} about
  * @property {(page: puppeteer.Page, port: number) => Promise<LH.UserFlow>} runUserFlow
  * @property {(artifacts: LH.Artifacts) => void} verify
- * @property {string|false} saveTrace
- * @property {string|false} saveDevtoolsLog
+ * @property {boolean} saveTrace
+ * @property {boolean} saveDevtoolsLog
  */
 
 /**
  * @param {CollectMeta} collectMeta
 */
 export async function updateTestFixture(collectMeta) {
-  const fixturesDir = `${LH_ROOT}/core/test/fixtures/traces`;
-
   const browser = await puppeteer.launch();
   const server = new Server(0);
-  server.baseDir = `${LH_ROOT}/core/test/fixtures/artifacts/${collectMeta.name}/page`;
+  const dir = `${LH_ROOT}/core/test/fixtures/artifacts/${collectMeta.name}`;
+  server.baseDir = `${dir}/page`;
   await server.listen(0, 'localhost');
   const port = server.getPort();
 
@@ -40,10 +39,10 @@ export async function updateTestFixture(collectMeta) {
     const {artifacts} = flow.createArtifactsJson().gatherSteps[0];
     collectMeta.verify(artifacts);
     if (collectMeta.saveTrace) {
-      await saveTrace(artifacts.Trace, `${fixturesDir}/${collectMeta.saveTrace}`);
+      await saveTrace(artifacts.Trace, `${dir}/trace.json`);
     }
     if (collectMeta.saveDevtoolsLog) {
-      await saveDevtoolsLog(artifacts.DevtoolsLog, `${fixturesDir}/${collectMeta.saveDevtoolsLog}`);
+      await saveDevtoolsLog(artifacts.DevtoolsLog, `${dir}/devtoolslog.json`);
     }
   } finally {
     await server.close();

core/test/fixtures/artifacts/user-timing/regenerate.js

@@ -44,7 +44,7 @@ function verify(artifacts) {
 await updateTestFixture({
   name: 'user-timing',
   about: 'Page with calls to the performance user timings API',
-  saveTrace: 'trace-user-timings.json',
+  saveTrace: true,
   saveDevtoolsLog: false,
   runUserFlow,
   verify,

core/test/fixtures/artifacts/video-embed/regenerate.js

@@ -38,9 +38,8 @@ function verify(artifacts) {
 await updateTestFixture({
   name: 'video-embed',
   about: 'Page with a YouTube and Vimeo video',
-  // TODO: drop m84 suffix
-  saveTrace: 'video-embeds-m84.json',
-  saveDevtoolsLog: 'video-embeds-m84.devtools.log.json',
+  saveTrace: true,
+  saveDevtoolsLog: true,
   runUserFlow,
   verify,
 });

core/test/gather/gatherers/trace-elements-test.js

@@ -11,7 +11,7 @@ import {createTestTrace, rootFrame} from '../../create-test-trace.js';
 import {createMockSendCommandFn, createMockOnFn} from '../mock-commands.js';
 import {flushAllTimersAndMicrotasks, fnAny, readJson, timers} from '../../test-utils.js';
 
-const animationTrace = readJson('../../fixtures/traces/animation.json', import.meta);
+const animationTrace = readJson('../../fixtures/artifacts/animation/trace.json', import.meta);
 
 function makeLayoutShiftTraceEvent(score, impactedNodes, had_recent_input = false) { // eslint-disable-line camelcase
   return {

core/test/lib/dependency-graph/simulator/network-analyzer-test.js

@@ -11,7 +11,7 @@ import {NetworkRecords} from '../../../../computed/network-records.js';
 import {readJson} from '../../../test-utils.js';
 
 const devtoolsLog = readJson('../../../fixtures/traces/progressive-app-m60.devtools.log.json', import.meta);
-const devtoolsLogWithRedirect = readJson('../../../fixtures/traces/site-with-redirect.devtools.log.json', import.meta);
+const devtoolsLogWithRedirect = readJson('../../../fixtures/artifacts/redirect/devtoolslog.json', import.meta);
 
 describe('DependencyGraph/Simulator/NetworkAnalyzer', () => {
   let recordId;