core(lhr): s/initialUrl/requestedUrl, s/url/finalUrl #5127
Conversation
brendankenny
requested review from
patrickhulce,
paulirish and
vinamratasingal-zz
as code owners
lighthouse-core/runner.js
Outdated
| @@ -119,12 +119,14 @@ class Runner { | |||
| reportCategories = ReportScoring.scoreAllCategories(opts.config.categories, resultsById); | |||
| } | |||
|
|
|||
| const finalUrl = artifacts.URL ? artifacts.URL.finalUrl : ''; | |||
There was a problem hiding this comment.
when do we not have one? isn't it always set now?
There was a problem hiding this comment.
lol i'm reading the opposite. since this PR nukes the URL gatherer how is artifacts.URL set?
There was a problem hiding this comment.
jk found it. it does appear to be set always..
so is this just handling someone has older saved artifacts they are -A'ing? lil funky.
There was a problem hiding this comment.
well he manually hardcodes artifacts.URL like we do run warnings/useragent/fetchTime so seems like it's a given now, but maybe I'm reading it wrong...
There was a problem hiding this comment.
good catch. Left over from getting un-updated tests to run :)
only future issue for those of us using saved artifacts (aka @paulirish) is that this is a breaking saved artifacts change, and since it'll be "cannot read property 'finalUrl' of undefined", this will throw on any -A run with previously saved artifacts instead of producing an LHR with an empty finalUrl
| @@ -1 +1,6 @@ | |||
| {} | |||
| { | |||
| @@ -88,7 +88,7 @@ describe('Module Tests', function() { | |||
| }); | |||
|
|
|||
| it('should return formatted LHR when given no categories', function() { | |||
| const exampleUrl = 'https://example.com/'; | |||
| const exampleUrl = 'https://www.reddit.com/r/nba'; | |||
There was a problem hiding this comment.
lol, any particular reason?
There was a problem hiding this comment.
I think thats what the devtoolsLog was for those fixtures, which spread to the artifacts, and now to the input URL (though I guess technically only the finalUrl assertion would have to change :)
| @@ -414,6 +414,7 @@ class GatherRunner { | |||
| const gathererResults = { | |||
| LighthouseRunWarnings: [], | |||
| fetchTime: [(new Date()).toJSON()], | |||
| URL: [{requestedUrl: options.requestedUrl, finalUrl: ''}], | |||
| const passContext = Object.assign({}, options, {passConfig}); | ||
| const passContext = { | ||
| driver: options.driver, | ||
| // If the main document redirects, we'll update this to keep track |
lighthouse-core/runner.js
Outdated
| @@ -119,12 +119,14 @@ class Runner { | |||
| reportCategories = ReportScoring.scoreAllCategories(opts.config.categories, resultsById); | |||
| } | |||
|
|
|||
| const finalUrl = artifacts.URL ? artifacts.URL.finalUrl : ''; | |||
There was a problem hiding this comment.
jk found it. it does appear to be set always..
so is this just handling someone has older saved artifacts they are -A'ing? lil funky.
also removes the
URLgatherer and collects the{requestedUrl, finalUrl}artifact in GatherRunner itself (alongsidefetchTime,UserAgent, etc). It will now always be collected (which makes sense).This allows us to finally break the mutable
options.urlfrom outsideRunner.runall the way down into every gatherer :):)passContext.urlis still mutable and follows the same behavior as before (to allow things like thehttp-redirectgatherer to work), but the connection is broken outside of that except for the single explicit write to the artifact.