diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /toolkit/components/normandy/actions | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/normandy/actions')
4 files changed, 4 insertions, 7 deletions
diff --git a/toolkit/components/normandy/actions/BaseAction.sys.mjs b/toolkit/components/normandy/actions/BaseAction.sys.mjs index cb9198a55e..25f64c293f 100644 --- a/toolkit/components/normandy/actions/BaseAction.sys.mjs +++ b/toolkit/components/normandy/actions/BaseAction.sys.mjs @@ -183,7 +183,7 @@ export class BaseAction { * * @param {Recipe} recipe */ - async _run(recipe) { + async _run() { throw new Error("Not implemented"); } diff --git a/toolkit/components/normandy/actions/BranchedAddonStudyAction.sys.mjs b/toolkit/components/normandy/actions/BranchedAddonStudyAction.sys.mjs index d775429ced..b3b111cdf8 100644 --- a/toolkit/components/normandy/actions/BranchedAddonStudyAction.sys.mjs +++ b/toolkit/components/normandy/actions/BranchedAddonStudyAction.sys.mjs @@ -115,7 +115,7 @@ export class BranchedAddonStudyAction extends BaseStudyAction { this.seenRecipeIds = new Set(); } - async _run(recipe) { + async _run() { throw new Error("_run should not be called anymore"); } diff --git a/toolkit/components/normandy/actions/PreferenceExperimentAction.sys.mjs b/toolkit/components/normandy/actions/PreferenceExperimentAction.sys.mjs index 310d1b08fd..0dc416d789 100644 --- a/toolkit/components/normandy/actions/PreferenceExperimentAction.sys.mjs +++ b/toolkit/components/normandy/actions/PreferenceExperimentAction.sys.mjs @@ -160,7 +160,7 @@ export class PreferenceExperimentAction extends BaseStudyAction { } } - async _run(recipe) { + async _run() { throw new Error("_run shouldn't be called anymore"); } diff --git a/toolkit/components/normandy/actions/ShowHeartbeatAction.sys.mjs b/toolkit/components/normandy/actions/ShowHeartbeatAction.sys.mjs index db9a4ec5ff..7e6af63266 100644 --- a/toolkit/components/normandy/actions/ShowHeartbeatAction.sys.mjs +++ b/toolkit/components/normandy/actions/ShowHeartbeatAction.sys.mjs @@ -72,10 +72,7 @@ export class ShowHeartbeatAction extends BaseAction { learnMoreUrl, postAnswerUrl: await this.generatePostAnswerURL(recipe), flowId: lazy.NormandyUtils.generateUuid(), - // Recipes coming from Nimbus won't have a revision_id. - ...(Object.hasOwn(recipe, "revision_id") - ? { surveyVersion: recipe.revision_id } - : {}), + surveyVersion: recipe.revision_id, }); heartbeat.eventEmitter.once( |