From d7021ad0009a1b4787169b4e7761a5d6889b2f50 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Mon, 17 Jun 2024 16:01:32 -0700 Subject: [PATCH] tests(lantern): fix some tests not running (#16073) --- core/lib/lantern/metrics/FirstContentfulPaint.test.js | 2 +- core/lib/lantern/metrics/Interactive.test.js | 4 ++-- core/lib/lantern/metrics/LargestContentfulPaint.test.js | 2 +- core/lib/lantern/metrics/SpeedIndex.test.js | 2 +- ...l-paint-test.js.snap => FirstContentfulPaint.test.js.snap} | 0 .../{interactive-test.js.snap => Interactive.test.js.snap} | 0 core/lib/lantern/simulation/NetworkAnalyzer.test.js | 4 ++-- core/lib/lantern/simulation/Simulator.test.js | 4 ++-- core/test/scripts/run-mocha-tests.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) rename core/lib/lantern/metrics/__snapshots__/{first-contentful-paint-test.js.snap => FirstContentfulPaint.test.js.snap} (100%) rename core/lib/lantern/metrics/__snapshots__/{interactive-test.js.snap => Interactive.test.js.snap} (100%) diff --git a/core/lib/lantern/metrics/FirstContentfulPaint.test.js b/core/lib/lantern/metrics/FirstContentfulPaint.test.js index b50be2de2087..0c95c38e6642 100644 --- a/core/lib/lantern/metrics/FirstContentfulPaint.test.js +++ b/core/lib/lantern/metrics/FirstContentfulPaint.test.js @@ -12,7 +12,7 @@ import {getComputationDataFromFixture} from './MetricTestUtils.js'; const {FirstContentfulPaint} = Lantern.Metrics; -const trace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta); +const trace = readJson('../../../test/fixtures/artifacts/progressive-app/trace.json', import.meta); describe('Metrics: Lantern FCP', () => { it('should compute predicted value', async () => { diff --git a/core/lib/lantern/metrics/Interactive.test.js b/core/lib/lantern/metrics/Interactive.test.js index 1272c7cce151..978c087b5028 100644 --- a/core/lib/lantern/metrics/Interactive.test.js +++ b/core/lib/lantern/metrics/Interactive.test.js @@ -12,8 +12,8 @@ import {readJson} from '../../../test/test-utils.js'; const {Interactive, FirstContentfulPaint, LargestContentfulPaint} = Lantern.Metrics; -const trace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta); -const iframeTrace = readJson('../../../fixtures/artifacts/iframe/trace.json', import.meta); +const trace = readJson('../../../test/fixtures/artifacts/progressive-app/trace.json', import.meta); +const iframeTrace = readJson('../../../test/fixtures/artifacts/iframe/trace.json', import.meta); describe('Metrics: Lantern TTI', () => { it('should compute predicted value', async () => { diff --git a/core/lib/lantern/metrics/LargestContentfulPaint.test.js b/core/lib/lantern/metrics/LargestContentfulPaint.test.js index 55d8136a8459..21120d9a2d82 100644 --- a/core/lib/lantern/metrics/LargestContentfulPaint.test.js +++ b/core/lib/lantern/metrics/LargestContentfulPaint.test.js @@ -12,7 +12,7 @@ import {readJson} from '../../../test/test-utils.js'; const {FirstContentfulPaint, LargestContentfulPaint} = Lantern.Metrics; -const trace = readJson('../../../fixtures/artifacts/paul/trace.json', import.meta); +const trace = readJson('../../../test/fixtures/artifacts/paul/trace.json', import.meta); describe('Metrics: Lantern LCP', () => { it('should compute predicted value', async () => { diff --git a/core/lib/lantern/metrics/SpeedIndex.test.js b/core/lib/lantern/metrics/SpeedIndex.test.js index bd48e0111604..e22a181d5cfd 100644 --- a/core/lib/lantern/metrics/SpeedIndex.test.js +++ b/core/lib/lantern/metrics/SpeedIndex.test.js @@ -10,7 +10,7 @@ import {getComputationDataFromFixture} from './MetricTestUtils.js'; const {SpeedIndex, FirstContentfulPaint} = Lantern.Metrics; -const trace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta); +const trace = readJson('../../../test/fixtures/artifacts/progressive-app/trace.json', import.meta); const defaultThrottling = Lantern.Simulation.Constants.throttling.mobileSlow4G; diff --git a/core/lib/lantern/metrics/__snapshots__/first-contentful-paint-test.js.snap b/core/lib/lantern/metrics/__snapshots__/FirstContentfulPaint.test.js.snap similarity index 100% rename from core/lib/lantern/metrics/__snapshots__/first-contentful-paint-test.js.snap rename to core/lib/lantern/metrics/__snapshots__/FirstContentfulPaint.test.js.snap diff --git a/core/lib/lantern/metrics/__snapshots__/interactive-test.js.snap b/core/lib/lantern/metrics/__snapshots__/Interactive.test.js.snap similarity index 100% rename from core/lib/lantern/metrics/__snapshots__/interactive-test.js.snap rename to core/lib/lantern/metrics/__snapshots__/Interactive.test.js.snap diff --git a/core/lib/lantern/simulation/NetworkAnalyzer.test.js b/core/lib/lantern/simulation/NetworkAnalyzer.test.js index e3f960d08779..7334bc9106a9 100644 --- a/core/lib/lantern/simulation/NetworkAnalyzer.test.js +++ b/core/lib/lantern/simulation/NetworkAnalyzer.test.js @@ -12,8 +12,8 @@ import {runTraceEngine} from '../metrics/MetricTestUtils.js'; const {NetworkAnalyzer} = Lantern.Simulation; -const trace = readJson('../../../fixtures/artifacts/paul/trace.json', import.meta); -const traceWithRedirect = readJson('../../../fixtures/artifacts/redirect/trace.json', import.meta); +const trace = readJson('../../../test/fixtures/artifacts/paul/trace.json', import.meta); +const traceWithRedirect = readJson('../../../test/fixtures/artifacts/redirect/trace.json', import.meta); /** * @param {Lantern.Trace} trace diff --git a/core/lib/lantern/simulation/Simulator.test.js b/core/lib/lantern/simulation/Simulator.test.js index 8b2975005324..cc76f686dca3 100644 --- a/core/lib/lantern/simulation/Simulator.test.js +++ b/core/lib/lantern/simulation/Simulator.test.js @@ -8,12 +8,12 @@ import assert from 'assert/strict'; import * as Lantern from '../lantern.js'; import {readJson} from '../../../test/test-utils.js'; -import {runTraceEngine} from '../../../test/lib/lantern/metrics/MetricTestUtils.js'; +import {runTraceEngine} from '../metrics/MetricTestUtils.js'; const {NetworkNode, CPUNode} = Lantern; const {Simulator, DNSCache} = Lantern.Simulation; -const pwaTrace = readJson('../../../fixtures/artifacts/progressive-app/trace.json', import.meta); +const pwaTrace = readJson('../../../test/fixtures/artifacts/progressive-app/trace.json', import.meta); let nextRequestId = 1; let nextTid = 1; diff --git a/core/test/scripts/run-mocha-tests.js b/core/test/scripts/run-mocha-tests.js index aef7edda22ee..d270a6f74ba0 100644 --- a/core/test/scripts/run-mocha-tests.js +++ b/core/test/scripts/run-mocha-tests.js @@ -171,7 +171,7 @@ const defaultTestMatches = [ 'cli/**/*-test.js', 'core/**/*-test.js', 'core/test/**/*-test-pptr.js', - 'core/lib/lantern/*.test.js', + 'core/lib/lantern/**/*.test.js', 'report/**/*-test.js', 'shared/**/*-test.js', 'third-party/**/*-test.js',