diff --git a/src/snapshots.js b/src/snapshots.js index 66ef6fc0..4327721d 100644 --- a/src/snapshots.js +++ b/src/snapshots.js @@ -173,8 +173,8 @@ export async function* takeStorybookSnapshots(percy, callback, { baseUrl, flags // gather storybook data in parallel let [environmentInfo, stories] = yield* yieldAll([ - withPage(percy, aboutUrl, p => p.eval(evalStorybookEnvironmentInfo), undefined, { from: 'about url', errorMessage: 'Unable to load about url' }), - withPage(percy, previewUrl, p => p.eval(evalStorybookStorySnapshots), undefined, { from: 'preview url', errorMessage: 'Unable to load preview url' }) + withPage(percy, aboutUrl, p => p.eval(evalStorybookEnvironmentInfo), undefined, { from: 'about url' }), + withPage(percy, previewUrl, p => p.eval(evalStorybookStorySnapshots), undefined, { from: 'preview url' }) ]); // map stories to snapshot options diff --git a/src/utils.js b/src/utils.js index d99055dc..e3f30770 100644 --- a/src/utils.js +++ b/src/utils.js @@ -193,12 +193,12 @@ export async function* withPage(percy, url, callback, retry, args) { } catch (error) { attempt++; let enableRetry = process.env.PERCY_RETRY_STORY_ON_ERROR || 'true'; + const from = args?.from; if (!(enableRetry === 'true') || attempt === retries) { // Add snapshotName to the error message const snapshotName = args?.snapshotName; - const errorMessage = args?.errorMessage; - if (errorMessage) { - error.message = `${errorMessage}: \n${error.message}`; + if (from) { + error.message = `${from}: \n${error.message}`; } if (snapshotName) { error.message = `Snapshot Name: ${snapshotName}: \n${error.message}`; @@ -210,9 +210,9 @@ export async function* withPage(percy, url, callback, retry, args) { if (args?.snapshotName) { log.warn(`Retrying Story: ${args.snapshotName}, attempt: ${attempt}`); } - if (args?.from) { + if (from) { log.warn( - `Retrying because error occurred in: ${args.from}, attempt: ${attempt}` + `Retrying because error occurred in: ${from}, attempt: ${attempt}` ); } }