Fix surrogate computation timing (#3161)

* Fix surrogate computation timing

* Wait for C-S-S injection

Author: jonathanKingston

Makefile

@@ -298,12 +298,12 @@ ifeq ('$(browser)','chrome')
 endif
 
 # Generate the list of "surrogate" (stub) scripts.
-$(BUILD_DIR)/data/surrogates.txt: $(BUILD_DIR)/web_accessible_resources $(LAST_COPY)
-	node scripts/generateListOfSurrogates.mjs -i $</ > $@
+$(BUILD_DIR)/data/surrogates.txt: $(LAST_COPY)
+	node scripts/generateListOfSurrogates.mjs -i $(BUILD_DIR)/web_accessible_resources/ > $@
 
 .SECONDARY:
-$(INTERMEDIATES_DIR)/surrogates.json: $(BUILD_DIR)/web_accessible_resources $(LAST_COPY)
-	node scripts/generateListOfSurrogates.mjs --json -i $</ > $@
+$(INTERMEDIATES_DIR)/surrogates.json: $(LAST_COPY)
+	node scripts/generateListOfSurrogates.mjs --json -i $(BUILD_DIR)/web_accessible_resources/ > $@
 
 BUILD_TARGETS += $(BUILD_DIR)/data/surrogates.txt
 

integration-test/gpc.spec.js

@@ -30,9 +30,14 @@ test('Ensure GPC is injected into frames', async ({ context, page, manifestVersi
         // Load an page with an iframe from a different hostname
         await page.bringToFront();
         await page.goto(`${fakeOrigin}/index.html?host=${iframeHost}`, { waitUntil: 'networkidle' });
+
+        // Wait for GPC injection
+        await page.waitForFunction(() => 'globalPrivacyControl' in navigator);
         const gpc = await getGPCValueOfContext(page);
 
         const iframeInstance = page.frames().find((iframe) => iframe.url() === iframeHost + '/framed.html');
+        // Wait for GPC injection in iframe
+        await iframeInstance.waitForFunction(() => 'globalPrivacyControl' in navigator);
         const gpc2 = await getGPCValueOfContext(iframeInstance);
 
         expect(gpc).toEqual(true);