Update tracker-protection tests to use withUserPreferences for trackerData

laghee · claude · laghee · commit 016be1a2c874 · 2026-03-11T16:16:37.000+01:00
Tests now explicitly pass trackerData via withUserPreferences() instead of
relying on bridging code. This matches production behavior where native apps
pass trackerData in $USER_PREFERENCES$ via ContentScopeProperties.trackerData.

Changes:
- Add tracker-data-fixtures.js with factory functions for test data
- Update all 24 tests to call withUserPreferences({ trackerData }) before load()
- Remove trackerData from config files (now passed via withUserPreferences only)

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-allowlisted.json b/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-allowlisted.json
@@ -1,5 +1,5 @@
 {
-  "readme": "Config for tracker-protection integration tests with an allowlist entry for tracker.example on localhost.",
+  "readme": "Config for tracker-protection integration tests with an allowlist entry for tracker.example on localhost. TrackerData is passed via withUserPreferences().",
   "version": 1,
   "features": {
     "trackerProtection": {
@@ -8,34 +8,6 @@
       "settings": {
         "blockingEnabled": true,
         "ctlEnabled": true,
-        "trackerData": {
-          "trackers": {
-            "tracker.example": {
-              "domain": "tracker.example",
-              "owner": {
-                "name": "Tracker Inc",
-                "displayName": "Tracker Inc"
-              },
-              "default": "block",
-              "rules": [
-                {
-                  "rule": "tracker\\.example/scripts/analytics\\.js",
-                  "surrogate": "analytics.js"
-                }
-              ]
-            }
-          },
-          "entities": {
-            "Tracker Inc": {
-              "domains": ["tracker.example"],
-              "displayName": "Tracker Inc",
-              "prevalence": 0.1
-            }
-          },
-          "domains": {
-            "tracker.example": "Tracker Inc"
-          }
-        },
         "allowlist": {
           "tracker.example": [
             {
diff --git a/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-ctl-action-prefix-disabled.json b/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-ctl-action-prefix-disabled.json
@@ -1,5 +1,5 @@
 {
-  "readme": "Test CTL action-prefix gating for non-fb surrogate when ctlEnabled is false",
+  "readme": "Test CTL action-prefix gating for non-fb surrogate when ctlEnabled is false. TrackerData is passed via withUserPreferences().",
   "version": 1,
   "features": {
     "trackerProtection": {
@@ -8,35 +8,6 @@
       "settings": {
         "blockingEnabled": true,
         "ctlEnabled": false,
-        "trackerData": {
-          "trackers": {
-            "tracker.example": {
-              "domain": "tracker.example",
-              "owner": {
-                "name": "Tracker Inc",
-                "displayName": "Tracker Inc"
-              },
-              "default": "block",
-              "rules": [
-                {
-                  "rule": "tracker\\.example/scripts/analytics\\.js",
-                  "surrogate": "analytics.js",
-                  "action": "block-ctl-yt"
-                }
-              ]
-            }
-          },
-          "entities": {
-            "Tracker Inc": {
-              "domains": ["tracker.example"],
-              "displayName": "Tracker Inc",
-              "prevalence": 0.1
-            }
-          },
-          "domains": {
-            "tracker.example": "Tracker Inc"
-          }
-        },
         "allowlist": {},
         "tempUnprotectedDomains": [],
         "userUnprotectedDomains": []
diff --git a/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-ctl-disabled.json b/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-ctl-disabled.json
@@ -1,5 +1,5 @@
 {
-  "readme": "Test CTL surrogate bypass when ctlEnabled is false",
+  "readme": "Test CTL surrogate bypass when ctlEnabled is false. TrackerData is passed via withUserPreferences().",
   "version": 1,
   "features": {
     "trackerProtection": {
@@ -8,34 +8,6 @@
       "settings": {
         "blockingEnabled": true,
         "ctlEnabled": false,
-        "trackerData": {
-          "trackers": {
-            "facebook.example": {
-              "domain": "facebook.example",
-              "owner": {
-                "name": "Facebook Inc",
-                "displayName": "Facebook"
-              },
-              "default": "ignore",
-              "rules": [
-                {
-                  "rule": "facebook\\.example/sdk\\.js",
-                  "surrogate": "fb-sdk.js",
-                  "action": "block-ctl-fb"
-                }
-              ]
-            }
-          },
-          "entities": {
-            "Facebook Inc": {
-              "domains": ["facebook.example"],
-              "displayName": "Facebook"
-            }
-          },
-          "domains": {
-            "facebook.example": "Facebook Inc"
-          }
-        },
         "allowlist": {},
         "tempUnprotectedDomains": [],
         "userUnprotectedDomains": []
diff --git a/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-ctl-enabled.json b/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-ctl-enabled.json
@@ -1,5 +1,5 @@
 {
-  "readme": "Test CTL surrogate injection when ctlEnabled is true",
+  "readme": "Test CTL surrogate injection when ctlEnabled is true. TrackerData is passed via withUserPreferences().",
   "version": 1,
   "features": {
     "trackerProtection": {
@@ -8,34 +8,6 @@
       "settings": {
         "blockingEnabled": true,
         "ctlEnabled": true,
-        "trackerData": {
-          "trackers": {
-            "facebook.example": {
-              "domain": "facebook.example",
-              "owner": {
-                "name": "Facebook Inc",
-                "displayName": "Facebook"
-              },
-              "default": "ignore",
-              "rules": [
-                {
-                  "rule": "facebook\\.example/sdk\\.js",
-                  "surrogate": "fb-sdk.js",
-                  "action": "block-ctl-fb"
-                }
-              ]
-            }
-          },
-          "entities": {
-            "Facebook Inc": {
-              "domains": ["facebook.example"],
-              "displayName": "Facebook"
-            }
-          },
-          "domains": {
-            "facebook.example": "Facebook Inc"
-          }
-        },
         "allowlist": {},
         "tempUnprotectedDomains": [],
         "userUnprotectedDomains": []
diff --git a/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-real-surrogates.json b/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-real-surrogates.json
@@ -1,5 +1,5 @@
 {
-  "readme": "Config for real-surrogate E2E tests. Uses real Google domains with surrogate names matching bundled surrogates.",
+  "readme": "Config for real-surrogate E2E tests. TrackerData is passed via withUserPreferences().",
   "version": 1,
   "features": {
     "trackerProtection": {
@@ -8,64 +8,6 @@
       "settings": {
         "blockingEnabled": true,
         "ctlEnabled": false,
-        "trackerData": {
-          "trackers": {
-            "google-analytics.com": {
-              "domain": "google-analytics.com",
-              "owner": {
-                "name": "Google LLC",
-                "displayName": "Google"
-              },
-              "default": "block",
-              "rules": [
-                {
-                  "rule": "google-analytics\\.com/analytics\\.js",
-                  "surrogate": "analytics.js"
-                }
-              ]
-            },
-            "googletagmanager.com": {
-              "domain": "googletagmanager.com",
-              "owner": {
-                "name": "Google LLC",
-                "displayName": "Google"
-              },
-              "default": "block",
-              "rules": [
-                {
-                  "rule": "googletagmanager\\.com/gtm\\.js",
-                  "surrogate": "gtm.js"
-                }
-              ]
-            },
-            "googletagservices.com": {
-              "domain": "googletagservices.com",
-              "owner": {
-                "name": "Google LLC",
-                "displayName": "Google"
-              },
-              "default": "block",
-              "rules": [
-                {
-                  "rule": "googletagservices\\.com/tag/js/gpt\\.js",
-                  "surrogate": "gpt.js"
-                }
-              ]
-            }
-          },
-          "entities": {
-            "Google LLC": {
-              "domains": ["google-analytics.com", "googletagmanager.com", "googletagservices.com"],
-              "displayName": "Google",
-              "prevalence": 0.8
-            }
-          },
-          "domains": {
-            "google-analytics.com": "Google LLC",
-            "googletagmanager.com": "Google LLC",
-            "googletagservices.com": "Google LLC"
-          }
-        },
         "allowlist": {},
         "tempUnprotectedDomains": [],
         "userUnprotectedDomains": []
diff --git a/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-unprotected.json b/injected/integration-test/test-pages/tracker-protection/config/tracker-protection-unprotected.json
@@ -1,5 +1,5 @@
 {
-  "readme": "Test unprotected domain behavior - reports but doesn't block",
+  "readme": "Test unprotected domain behavior - reports but doesn't block. TrackerData is passed via withUserPreferences().",
   "version": 1,
   "features": {
     "trackerProtection": {
@@ -8,27 +8,6 @@
       "settings": {
         "blockingEnabled": true,
         "ctlEnabled": true,
-        "trackerData": {
-          "trackers": {
-            "tracker.example": {
-              "domain": "tracker.example",
-              "owner": {
-                "name": "Tracker Inc",
-                "displayName": "Tracker Inc"
-              },
-              "default": "block"
-            }
-          },
-          "entities": {
-            "Tracker Inc": {
-              "domains": ["tracker.example"],
-              "displayName": "Tracker Inc"
-            }
-          },
-          "domains": {
-            "tracker.example": "Tracker Inc"
-          }
-        },
         "allowlist": {},
         "tempUnprotectedDomains": ["localhost"],
         "userUnprotectedDomains": []
diff --git a/injected/integration-test/test-pages/tracker-protection/config/tracker-protection.json b/injected/integration-test/test-pages/tracker-protection/config/tracker-protection.json
@@ -1,5 +1,5 @@
 {
-  "readme": "Config for tracker-protection integration tests with sample tracker data and surrogate rules.",
+  "readme": "Config for tracker-protection integration tests. TrackerData is passed via withUserPreferences().",
   "version": 1,
   "features": {
     "trackerProtection": {
@@ -8,49 +8,6 @@
       "settings": {
         "blockingEnabled": true,
         "ctlEnabled": true,
-        "trackerData": {
-          "trackers": {
-            "tracker.example": {
-              "domain": "tracker.example",
-              "owner": {
-                "name": "Tracker Inc",
-                "displayName": "Tracker Inc"
-              },
-              "default": "block",
-              "rules": [
-                {
-                  "rule": "tracker\\.example/scripts/analytics\\.js",
-                  "surrogate": "analytics.js"
-                }
-              ]
-            },
-            "allowed.example": {
-              "domain": "allowed.example",
-              "owner": {
-                "name": "Allowed Inc"
-              },
-              "default": "ignore",
-              "rules": []
-            }
-          },
-          "entities": {
-            "Tracker Inc": {
-              "domains": ["tracker.example"],
-              "displayName": "Tracker Inc",
-              "prevalence": 0.1
-            },
-            "Test Site Inc": {
-              "domains": ["localhost", "affiliated-cdn.example"],
-              "displayName": "Test Site Inc",
-              "prevalence": 0.05
-            }
-          },
-          "domains": {
-            "tracker.example": "Tracker Inc",
-            "localhost": "Test Site Inc",
-            "affiliated-cdn.example": "Test Site Inc"
-          }
-        },
         "allowlist": {},
         "tempUnprotectedDomains": [],
         "userUnprotectedDomains": []
diff --git a/injected/integration-test/test-pages/tracker-protection/tracker-data-fixtures.js b/injected/integration-test/test-pages/tracker-protection/tracker-data-fixtures.js
diff --git a/injected/integration-test/tracker-protection.spec.js b/injected/integration-test/tracker-protection.spec.js
