Update storage tests for updated test page (#1546)

* Update storage tests for updated test page * Correctly filter tests by manifest version * Fix manifestVersion detection in another place.
duckduckgo · Nov 21, 2022 · 54cd161 · 54cd161
1 parent b21a7ce
commit 54cd161
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 22 deletions.
diff --git a/integration-test/background/storage.js b/integration-test/background/storage.js
@@ -8,13 +8,13 @@ const thirdPartyDomain = 'good.third-party.site'
 const thirdPartyTracker = 'broken.third-party.site'
 
 async function setup () {
-    const { browser, bgPage, teardown, manifestVersion } = await harness.setup()
+    const { browser, bgPage, teardown } = await harness.setup()
     const page = await browser.newPage()
 
     await backgroundWait.forAllConfiguration(bgPage)
     await loadTestConfig(bgPage, 'storage-blocking.json')
 
-    return { browser, page, teardown, bgPage, manifestVersion }
+    return { browser, page, teardown, bgPage }
 }
 
 async function waitForAllResults (page) {
@@ -26,12 +26,9 @@ async function waitForAllResults (page) {
 describe('Storage blocking Tests', () => {
     describe(`On https://${testPageDomain}/privacy-protections/storage-blocking/`, () => {
         let cookies = []
-        let manifestVersion
 
         beforeAll(async () => {
-            let page
-            let teardown
-            ({ page, teardown, manifestVersion } = await setup())
+            const { page, teardown } = await setup()
             try {
                 // Load the test pages home first to give some time for the extension background to start
                 // and register the content-script-message handler
@@ -49,24 +46,47 @@ describe('Storage blocking Tests', () => {
         })
 
         it('does not block 1st party HTTP cookies', () => {
-            const headerCookie = cookies.find(({ name, domain }) => name === 'headerdata' && domain === testPageDomain)
+            const headerCookie = cookies.find(({ name, domain }) => name === 'top_firstparty_headerdata' && domain === testPageDomain)
             expect(headerCookie).toBeTruthy()
             expect(headerCookie.expires).toBeGreaterThan(Date.now() / 1000)
         })
 
         // FIXME - Once Cookie header blocking is working in the experimental
         //         Chrome MV3 build of the extension we should remove this
         //         condition.
-        if (manifestVersion === 2) {
-            it('blocks 3rd party HTTP cookies not on block list', () => {
-                const headerCookie = cookies.find(({ name, domain }) => name === 'headerdata' && domain === thirdPartyDomain)
-                expect(headerCookie).toBeUndefined()
+        if (harness.getManifestVersion() !== 3) {
+            it('allows 3rd party HTTP cookies not on block list', () => {
+                const headerCookie = cookies.find(({ name, domain }) => name === 'top_thirdparty_headerdata' && domain === thirdPartyDomain)
+                expect(headerCookie).toBeTruthy()
+                expect(headerCookie.expires).toBeGreaterThan(Date.now() / 1000)
             })
 
             it('blocks 3rd party HTTP cookies for trackers', () => {
-                const headerCookie = cookies.find(({ name, domain }) => name === 'headerdata' && domain === thirdPartyTracker)
+                const headerCookie = cookies.find(({ name, domain }) => name === 'top_tracker_headerdata' && domain === thirdPartyTracker)
+                expect(headerCookie).toBeUndefined()
+            })
+
+            it('allows 1st party HTTP cookies from non-tracker frames', () => {
+                const headerCookie = cookies.find(({ name, domain }) => name === 'thirdparty_firstparty_headerdata' && domain === thirdPartyDomain)
+                expect(headerCookie).toBeTruthy()
+                expect(headerCookie.expires).toBeGreaterThan(Date.now() / 1000)
+            })
+
+            it('blocks 3rd party tracker HTTP cookies from non-tracker frames', () => {
+                const headerCookie = cookies.find(({ name, domain }) => name === 'thirdparty_tracker_headerdata' && domain === thirdPartyTracker)
                 expect(headerCookie).toBeUndefined()
             })
+
+            it('blocks 1st party HTTP cookies from tracker frames', () => {
+                const headerCookie = cookies.find(({ name, domain }) => name === 'thirdpartytracker_firstparty_headerdata' && domain === thirdPartyTracker)
+                expect(headerCookie).toBeUndefined()
+            })
+
+            it('allows 3rd party tracker HTTP cookies from tracker frames', () => {
+                const headerCookie = cookies.find(({ name, domain }) => name === 'thirdpartytracker_thirdparty_headerdata' && domain === thirdPartyDomain)
+                expect(headerCookie).toBeTruthy()
+                expect(headerCookie.expires).toBeGreaterThan(Date.now() / 1000)
+            })
         }
 
         it('does not block 1st party JS cookies', () => {
@@ -75,9 +95,9 @@ describe('Storage blocking Tests', () => {
             expect(jsCookie.expires).toBeGreaterThan(Date.now() / 1000)
         })
 
-        it('does block 3rd party JS cookies not on block list', () => {
+        it('does not block 3rd party JS cookies not on block list', () => {
             const jsCookie = cookies.find(({ name, domain }) => name === 'jsdata' && domain === thirdPartyDomain)
-            expect(jsCookie).toBeUndefined()
+            expect(jsCookie).toBeTruthy()
         })
 
         it('blocks 3rd party JS cookies from trackers', () => {

diff --git a/integration-test/content-scripts/gpc.js b/integration-test/content-scripts/gpc.js
@@ -43,11 +43,10 @@ const frameTests = [
 let server
 let server2
 let teardown
-let manifestVersion
 
 describe('Ensure GPC is injected into frames', () => {
     beforeAll(async () => {
-        ({ browser, bgPage, teardown, manifestVersion } = await harness.setup())
+        ({ browser, bgPage, teardown } = await harness.setup())
         server = setupServer({}, 8080)
         server2 = setupServer({}, 8081)
 
@@ -75,7 +74,7 @@ describe('Ensure GPC is injected into frames', () => {
 
         // FIXME - chrome.scripting API is not yet injecting into about:blank
         //         frames correctly. See https://crbug.com/1360392.
-        if (manifestVersion === 2) {
+        if (harness.getManifestVersion() === 2) {
             it(`${iframeHost} should work with about:blank injected frames`, async () => {
                 const page = await browser.newPage()
                 await pageWait.forGoto(page, 'http://127.0.0.1:8080/blank_framer.html')

diff --git a/integration-test/data/configs/storage-blocking.json b/integration-test/data/configs/storage-blocking.json
@@ -31,7 +31,7 @@
             },
             "excludedCookieDomains": [ ],
             "trackerCookie": "enabled",
-            "nonTrackerCookie": "enabled"
+            "nonTrackerCookie": "disabled"
         },
         "exceptions": [ ],
         "state": "enabled"

diff --git a/integration-test/helpers/harness.js b/integration-test/helpers/harness.js
@@ -25,8 +25,7 @@ const setup = async (ops) => {
         `--user-data-dir=${dataDir}`
     ]
 
-    const manifestVersion =
-        process.env.npm_lifecycle_event === 'test-int-mv3' ? 3 : 2
+    const manifestVersion = getManifestVersion()
 
     if (loadExtension) {
         let extensionPath = 'build/chrome/dev'
@@ -93,9 +92,14 @@ const setup = async (ops) => {
         spawnSync('rm', ['-rf', dataDir])
     }
 
-    return { browser, bgPage, requests, teardown, manifestVersion }
+    return { browser, bgPage, requests, teardown }
+}
+
+function getManifestVersion () {
+    return process.env.npm_lifecycle_event === 'test-int-mv3' ? 3 : 2
 }
 
 module.exports = {
-    setup
+    setup,
+    getManifestVersion
 }