diff --git a/toolkit/components/antitracking/test/browser/browser.ini b/toolkit/components/antitracking/test/browser/browser.ini index 468de53a6600..6af5e8b02043 100644 --- a/toolkit/components/antitracking/test/browser/browser.ini +++ b/toolkit/components/antitracking/test/browser/browser.ini @@ -29,6 +29,7 @@ support-files = server.sjs [browser_imageCache4.js] [browser_imageCache5.js] [browser_imageCache6.js] +[browser_imageCache7.js] [browser_onBeforeRequestNotificationForTrackingResources.js] [browser_onModifyRequestNotificationForTrackingResources.js] [browser_permissionInNormalWindows.js] diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache1.js b/toolkit/components/antitracking/test/browser/browser_imageCache1.js index 054fe84cd1a8..7caac8d42e61 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache1.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache1.js @@ -3,6 +3,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = false; let blockingByAllowList = false; +let expectedBlockingNotifications = true; let rootDir = getRootDirectory(gTestPath); let jar = getJar(rootDir); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache2.js b/toolkit/components/antitracking/test/browser/browser_imageCache2.js index 1c63dfb83f78..e781b2713c96 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache2.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache2.js @@ -3,6 +3,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = true; let blockingByAllowList = false; +let expectedBlockingNotifications = true; let rootDir = getRootDirectory(gTestPath); let jar = getJar(rootDir); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache3.js b/toolkit/components/antitracking/test/browser/browser_imageCache3.js index 054fe84cd1a8..7caac8d42e61 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache3.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache3.js @@ -3,6 +3,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = false; let blockingByAllowList = false; +let expectedBlockingNotifications = true; let rootDir = getRootDirectory(gTestPath); let jar = getJar(rootDir); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache4.js b/toolkit/components/antitracking/test/browser/browser_imageCache4.js index 57b0d0958037..c4b29529320a 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache4.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache4.js @@ -3,6 +3,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_TRACKER; let blockingByContentBlocking = true; let blockingByAllowList = true; +let expectedBlockingNotifications = true; let rootDir = getRootDirectory(gTestPath); let jar = getJar(rootDir); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache5.js b/toolkit/components/antitracking/test/browser/browser_imageCache5.js index 4d6d5503c556..9545cb916493 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache5.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache5.js @@ -3,6 +3,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; let blockingByContentBlocking = true; let blockingByAllowList = true; +let expectedBlockingNotifications = true; let rootDir = getRootDirectory(gTestPath); let jar = getJar(rootDir); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache6.js b/toolkit/components/antitracking/test/browser/browser_imageCache6.js index 64715f05364d..9c70ea3e3ea5 100644 --- a/toolkit/components/antitracking/test/browser/browser_imageCache6.js +++ b/toolkit/components/antitracking/test/browser/browser_imageCache6.js @@ -3,6 +3,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm"); let cookieBehavior = BEHAVIOR_REJECT_FOREIGN; let blockingByContentBlocking = false; let blockingByAllowList = false; +let expectedBlockingNotifications = true; let rootDir = getRootDirectory(gTestPath); let jar = getJar(rootDir); diff --git a/toolkit/components/antitracking/test/browser/browser_imageCache7.js b/toolkit/components/antitracking/test/browser/browser_imageCache7.js new file mode 100644 index 000000000000..3a920d4774a1 --- /dev/null +++ b/toolkit/components/antitracking/test/browser/browser_imageCache7.js @@ -0,0 +1,19 @@ +ChromeUtils.import("resource://gre/modules/Services.jsm"); + +/* Setting a custom permission for this website */ +let uriObj = Services.io.newURI(TEST_DOMAIN); +Services.perms.add(uriObj, "cookie", Services.perms.ALLOW_ACTION); + +let cookieBehavior = BEHAVIOR_REJECT_TRACKER; +let blockingByContentBlocking = false; +let blockingByAllowList = false; +let expectedBlockingNotifications = false; + +let rootDir = getRootDirectory(gTestPath); +let jar = getJar(rootDir); +if (jar) { + let tmpdir = extractJarToTmp(jar); + rootDir = "file://" + tmpdir.path + "/"; +} +/* import-globals-from imageCacheWorker.js */ +Services.scriptloader.loadSubScript(rootDir + "imageCacheWorker.js", this); diff --git a/toolkit/components/antitracking/test/browser/imageCacheWorker.js b/toolkit/components/antitracking/test/browser/imageCacheWorker.js index 045d735d68b3..f62626ad4aa4 100644 --- a/toolkit/components/antitracking/test/browser/imageCacheWorker.js +++ b/toolkit/components/antitracking/test/browser/imageCacheWorker.js @@ -43,7 +43,8 @@ AntiTracking.runTest("Image cache - should load the image twice.", null, // cleanup function null, // no extra prefs false, // no window open test - false // no user-interaction test + false, // no user-interaction test + expectedBlockingNotifications ); // We still want to see just 2 requests.