From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- toolkit/components/normandy/test/unit/test_NormandyApi.js | 4 ++-- toolkit/components/normandy/test/unit/test_RecipeRunner.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'toolkit/components/normandy/test/unit') 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", -- cgit v1.2.3