diff options
Diffstat (limited to 'toolkit/components/normandy')
3 files changed, 9 insertions, 6 deletions
diff --git a/toolkit/components/normandy/lib/RecipeRunner.sys.mjs b/toolkit/components/normandy/lib/RecipeRunner.sys.mjs index f9578b37d2..087e4ed51e 100644 --- a/toolkit/components/normandy/lib/RecipeRunner.sys.mjs +++ b/toolkit/components/normandy/lib/RecipeRunner.sys.mjs @@ -197,7 +197,7 @@ export var RecipeRunner = { }, checkPrefs() { - if (!Services.prefs.getBoolPref(SHIELD_ENABLED_PREF)) { + if (!Services.prefs.getBoolPref(SHIELD_ENABLED_PREF, false)) { log.debug( `Disabling Shield because ${SHIELD_ENABLED_PREF} is set to false` ); @@ -205,7 +205,7 @@ export var RecipeRunner = { return; } - const apiUrl = Services.prefs.getCharPref(API_URL_PREF); + const apiUrl = Services.prefs.getCharPref(API_URL_PREF, ""); if (!apiUrl) { log.warn(`Disabling Shield because ${API_URL_PREF} is not set.`); this.disable(); @@ -287,7 +287,7 @@ export var RecipeRunner = { // Run once every `runInterval` wall-clock seconds. This is managed by setting a "last ran" // timestamp, and running if it is more than `runInterval` seconds ago. Even with very short // intervals, the timer will only fire at most once every few minutes. - const runInterval = Services.prefs.getIntPref(RUN_INTERVAL_PREF); + const runInterval = Services.prefs.getIntPref(RUN_INTERVAL_PREF, 21600); // 6h lazy.timerManager.registerTimer(TIMER_NAME, () => this.run(), runInterval); }, @@ -597,7 +597,7 @@ export var RecipeRunner = { * executed in the browser console. */ async testRun(baseApiUrl) { - const oldApiUrl = Services.prefs.getCharPref(API_URL_PREF); + const oldApiUrl = Services.prefs.getCharPref(API_URL_PREF, ""); Services.prefs.setCharPref(API_URL_PREF, baseApiUrl); try { diff --git a/toolkit/components/normandy/test/unit/test_NormandyApi.js b/toolkit/components/normandy/test/unit/test_NormandyApi.js index 5b0ede1701..cd15aff965 100644 --- a/toolkit/components/normandy/test/unit/test_NormandyApi.js +++ b/toolkit/components/normandy/test/unit/test_NormandyApi.js @@ -195,7 +195,7 @@ decorate_task( // response that sets a cookie. // send a request, to store a cookie in the cookie store - await fetch(serverUrl); + await fetch(serverUrl, { credentials: "same-origin" }); // A normal request should send that cookie const cookieExpectedDeferred = Promise.withResolvers(); @@ -218,7 +218,7 @@ decorate_task( cookieExpectedDeferred.resolve(); } Services.obs.addObserver(cookieExpectedObserver, "http-on-modify-request"); - await fetch(serverUrl); + await fetch(serverUrl, { credentials: "same-origin" }); await cookieExpectedDeferred.promise; // A request through the NormandyApi method should not send that cookie diff --git a/toolkit/components/normandy/test/unit/test_RecipeRunner.js b/toolkit/components/normandy/test/unit/test_RecipeRunner.js index 710ac4d507..cfc83714f1 100644 --- a/toolkit/components/normandy/test/unit/test_RecipeRunner.js +++ b/toolkit/components/normandy/test/unit/test_RecipeRunner.js @@ -12,6 +12,9 @@ const { RecipeRunner } = ChromeUtils.importESModule( // Test that new build IDs trigger immediate recipe runs add_task(async () => { + // This test assumes normandy is enabled. + Services.prefs.setBoolPref("app.normandy.enabled", true); + updateAppInfo({ appBuildID: "new-build-id", lastAppBuildID: "old-build-id", |