Revert "core(fr): use frame url in gather context (GoogleChrome#13699)"

This reverts commit 74bf436.

lighthouse-cli/test/smokehouse/core-tests.js

@@ -53,7 +53,6 @@ import redirectsHistoryPushState from './test-definitions/redirects-history-push
 import redirectsMultipleServer from './test-definitions/redirects-multiple-server.js';
 import redirectsSingleClient from './test-definitions/redirects-single-client.js';
 import redirectsSingleServer from './test-definitions/redirects-single-server.js';
-import redirectsSelf from './test-definitions/redirects-self.js';
 import screenshot from './test-definitions/screenshot.js';
 import seoFailing from './test-definitions/seo-failing.js';
 import seoPassing from './test-definitions/seo-passing.js';
@@ -112,7 +111,6 @@ const smokeTests = [
   redirectsMultipleServer,
   redirectsSingleClient,
   redirectsSingleServer,
-  redirectsSelf,
   screenshot,
   seoFailing,
   seoPassing,

lighthouse-core/fraggle-rock/gather/navigation-runner.js

@@ -210,7 +210,6 @@ async function _computeNavigationResult(
 async function _navigation(navigationContext) {
   const artifactState = getEmptyArtifactState();
   const phaseState = {
-    url: await navigationContext.driver.url(),
     gatherMode: /** @type {const} */ ('navigation'),
     driver: navigationContext.driver,
     computedCache: navigationContext.computedCache,
@@ -224,7 +223,6 @@ async function _navigation(navigationContext) {
   await collectPhaseArtifacts({phase: 'startInstrumentation', ...phaseState});
   await collectPhaseArtifacts({phase: 'startSensitiveInstrumentation', ...phaseState});
   const navigateResult = await _navigate(navigationContext);
-  phaseState.url = navigateResult.finalUrl;
   await collectPhaseArtifacts({phase: 'stopSensitiveInstrumentation', ...phaseState});
   await collectPhaseArtifacts({phase: 'stopInstrumentation', ...phaseState});
   await _cleanupNavigation(navigationContext);

lighthouse-core/fraggle-rock/gather/runner-helpers.js

@@ -15,7 +15,6 @@
  * @property {LH.Gatherer.GatherMode} gatherMode
  * @property {Map<string, LH.ArbitraryEqualityMap>} computedCache
  * @property {LH.Config.Settings} settings
- * @property {string} url
  */
 
 /** @typedef {Record<string, Promise<any>>} IntermediateArtifacts */
@@ -75,7 +74,6 @@ async function collectPhaseArtifacts(options) {
     gatherMode,
     computedCache,
     settings,
-    url,
   } = options;
   const priorPhase = phaseToPriorPhase[phase];
   const priorPhaseArtifacts = (priorPhase && artifactState[priorPhase]) || {};
@@ -92,7 +90,7 @@ async function collectPhaseArtifacts(options) {
         : /** @type {Dependencies} */ ({});
 
       return gatherer[phase]({
-        url,
+        url: await driver.url(),
         gatherMode,
         driver,
         baseArtifacts,

lighthouse-core/fraggle-rock/gather/snapshot-runner.js

@@ -27,7 +27,7 @@ async function snapshot(options) {
 
   /** @type {Map<string, LH.ArbitraryEqualityMap>} */
   const computedCache = new Map();
-  const url = await driver.url();
+  const url = await options.page.url();
 
   const runnerOptions = {config, computedCache};
   const artifacts = await Runner.gather(
@@ -39,7 +39,6 @@ async function snapshot(options) {
       const artifactDefinitions = config.artifacts || [];
       const artifactState = getEmptyArtifactState();
       await collectPhaseArtifacts({
-        url,
         phase: 'getArtifact',
         gatherMode: 'snapshot',
         driver,

lighthouse-core/fraggle-rock/gather/timespan-runner.js

@@ -32,12 +32,11 @@ async function startTimespan(options) {
   /** @type {Map<string, LH.ArbitraryEqualityMap>} */
   const computedCache = new Map();
   const artifactDefinitions = config.artifacts || [];
-  const requestedUrl = await driver.url();
+  const requestedUrl = await options.page.url();
   const baseArtifacts = await getBaseArtifacts(config, driver, {gatherMode: 'timespan'});
   const artifactState = getEmptyArtifactState();
   /** @type {Omit<import('./runner-helpers.js').CollectPhaseArtifactOptions, 'phase'>} */
   const phaseOptions = {
-    url: requestedUrl,
     driver,
     artifactDefinitions,
     artifactState,
@@ -53,9 +52,7 @@ async function startTimespan(options) {
 
   return {
     async endTimespan() {
-      const finalUrl = await driver.url();
-      phaseOptions.url = finalUrl;
-
+      const finalUrl = await options.page.url();
       const runnerOptions = {config, computedCache};
       const artifacts = await Runner.gather(
         async () => {

lighthouse-core/test/fraggle-rock/gather/mock-driver.js

@@ -129,7 +129,7 @@ function createMockDriver() {
     _page: page,
     _executionContext: context,
     _session: session,
-    url: jest.fn(() => page.url()),
+    url: () => page.url(),
     defaultSession: session,
     connect: jest.fn(),
     disconnect: jest.fn(),

lighthouse-core/test/fraggle-rock/gather/runner-helpers-test.js

@@ -132,7 +132,6 @@ describe('collectPhaseArtifacts', () => {
       it(`should run the ${phase} phase of gatherers in ${gatherMode} mode`, async () => {
         const {artifactDefinitions, gatherers} = createGathererSet();
         await helpers.collectPhaseArtifacts({
-          url: 'https://example.com',
           driver,
           artifactDefinitions,
           artifactState,
@@ -157,7 +156,6 @@ describe('collectPhaseArtifacts', () => {
   it('should gather the artifacts', async () => {
     const {artifactDefinitions} = createGathererSet();
     await helpers.collectPhaseArtifacts({
-      url: 'https://example.com',
       driver,
       artifactDefinitions,
       artifactState,
@@ -190,7 +188,6 @@ describe('collectPhaseArtifacts', () => {
     ];
 
     await helpers.collectPhaseArtifacts({
-      url: 'https://example.com',
       driver,
       artifactDefinitions,
       artifactState,
@@ -224,7 +221,6 @@ describe('collectPhaseArtifacts', () => {
 
     const {artifactDefinitions, gatherers} = createGathererSet();
     await helpers.collectPhaseArtifacts({
-      url: 'https://example.com',
       driver,
       artifactDefinitions,
       artifactState,

lighthouse-core/test/fraggle-rock/gather/snapshot-runner-test.js

@@ -71,7 +71,7 @@ describe('Snapshot Runner', () => {
   });
 
   it('should collect base artifacts', async () => {
-    mockDriver.url.mockResolvedValue('https://lighthouse.example.com/');
+    mockPage.url.mockResolvedValue('https://lighthouse.example.com/');
 
     await snapshot({page, config});
     const artifacts = await mockRunner.gather.mock.calls[0][0]();

lighthouse-core/test/fraggle-rock/gather/timespan-runner-test.js

@@ -90,11 +90,11 @@ describe('Timespan Runner', () => {
   });
 
   it('should collect base artifacts', async () => {
-    mockDriver.url.mockResolvedValue('https://start.example.com/');
+    mockPage.url.mockResolvedValue('https://start.example.com/');
 
     const timespan = await startTimespan({page, config});
 
-    mockDriver.url.mockResolvedValue('https://end.example.com/');
+    mockPage.url.mockResolvedValue('https://end.example.com/');
 
     await timespan.endTimespan();
     const artifacts = await mockRunner.gather.mock.calls[0][0]();