Replace ccpa with usnat throughout tests

guardian · Aug 29, 2024 · 0670f69 · 0670f69
1 parent b7f6e34
commit 0670f69
Show file tree

Hide file tree

Showing 11 changed files with 239 additions and 134 deletions.
diff --git a/src/core/send-commercial-metrics.spec.ts b/src/core/send-commercial-metrics.spec.ts
@@ -1,4 +1,4 @@
-import type { ConsentState } from '@guardian/libs';
+import type { ConsentState, USNATConsentState } from '@guardian/libs';
 import { onConsent } from '@guardian/libs';
 import { EventTimer } from './event-timer';
 import {
@@ -103,16 +103,28 @@ const tcfv2AllConsentExceptPurpose8: ConsentState = {
 	framework: 'tcfv2',
 };
 
-const ccpaConsent: ConsentState = {
-	ccpa: { doNotSell: false, signalStatus: 'ready' },
+const usnatNonConsentObject: USNATConsentState = {
+	doNotSell: true,
+	signalStatus: 'ready',
+};
+
+const usnatConsentObject: USNATConsentState = {
+	doNotSell: false,
+	signalStatus: 'ready',
+};
+
+const usnatConsent: ConsentState = {
+	ccpa: usnatConsentObject,
+	usnat: usnatConsentObject,
 	canTarget: true,
-	framework: 'ccpa',
+	framework: 'usnat',
 };
 
-const ccpaNonConsent: ConsentState = {
-	ccpa: { doNotSell: true, signalStatus: 'ready' },
+const usnatNonConsent: ConsentState = {
+	ccpa: usnatNonConsentObject,
+	usnat: usnatNonConsentObject,
 	canTarget: false,
-	framework: 'ccpa',
+	framework: 'usnat',
 };
 
 const setVisibility = (value: 'hidden' | 'visible'): void => {
@@ -212,7 +224,7 @@ describe('send commercial metrics', () => {
 	});
 
 	it('sends metrics when non-TCFv2 user (i.e. USA or Australia) consents', async () => {
-		mockOnConsent(ccpaConsent);
+		mockOnConsent(usnatConsent);
 
 		await initCommercialMetrics({
 			pageViewId: PAGE_VIEW_ID,
@@ -231,7 +243,7 @@ describe('send commercial metrics', () => {
 	});
 
 	it('sends metrics when non-TCFv2 user (i.e. USA or Australia) does not consent', async () => {
-		mockOnConsent(ccpaNonConsent);
+		mockOnConsent(usnatNonConsent);
 
 		await initCommercialMetrics({
 			pageViewId: PAGE_VIEW_ID,

diff --git a/src/core/targeting/build-page-targeting.spec.ts b/src/core/targeting/build-page-targeting.spec.ts
@@ -1,4 +1,8 @@
-import type { ConsentState, TCFv2ConsentState } from '@guardian/libs';
+import type {
+	ConsentState,
+	TCFv2ConsentState,
+	USNATConsentState,
+} from '@guardian/libs';
 import { cmp as cmp_, setCookie, storage } from '@guardian/libs';
 import { getAuthStatus as getAuthStatus_ } from 'lib/identity/api';
 import type { AuthStatus } from 'lib/identity/api';
@@ -52,17 +56,29 @@ const mockViewport = (width: number, height: number): void => {
 	});
 };
 
-// CCPA
-const ccpaWithConsentMock: ConsentState = {
-	ccpa: { doNotSell: false, signalStatus: 'ready' },
+const usnatConsent: USNATConsentState = {
+	doNotSell: false,
+	signalStatus: 'ready',
+};
+
+const usnatNonConsent: USNATConsentState = {
+	doNotSell: true,
+	signalStatus: 'ready',
+};
+
+// USNAT
+const usnatWithConsentMock: ConsentState = {
+	ccpa: usnatConsent,
+	usnat: usnatConsent,
 	canTarget: true,
-	framework: 'ccpa',
+	framework: 'usnat',
 };
 
-const ccpaWithoutConsentMock: ConsentState = {
-	ccpa: { doNotSell: true, signalStatus: 'ready' },
+const usnatWithoutConsentMock: ConsentState = {
+	ccpa: usnatNonConsent,
+	usnat: usnatNonConsent,
 	canTarget: false,
-	framework: 'ccpa',
+	framework: 'usnat',
 };
 
 // AUS
@@ -258,15 +274,15 @@ describe('Build Page Targeting', () => {
 			buildPageTargeting({
 				adFree: false,
 				clientSideParticipations: {},
-				consentState: ccpaWithConsentMock,
+				consentState: usnatWithConsentMock,
 				isSignedIn: true,
 			}).pa,
 		).toBe('t');
 		expect(
 			buildPageTargeting({
 				adFree: false,
 				clientSideParticipations: {},
-				consentState: ccpaWithoutConsentMock,
+				consentState: usnatWithoutConsentMock,
 				isSignedIn: true,
 			}).pa,
 		).toBe('f');
@@ -293,15 +309,15 @@ describe('Build Page Targeting', () => {
 			buildPageTargeting({
 				adFree: false,
 				clientSideParticipations: {},
-				consentState: ccpaWithConsentMock,
+				consentState: usnatWithConsentMock,
 				isSignedIn: true,
 			}).rdp,
 		).toBe('f');
 		expect(
 			buildPageTargeting({
 				adFree: false,
 				clientSideParticipations: {},
-				consentState: ccpaWithoutConsentMock,
+				consentState: usnatWithoutConsentMock,
 				isSignedIn: true,
 			}).rdp,
 		).toBe('t');
@@ -598,7 +614,7 @@ describe('Build Page Targeting', () => {
 				buildPageTargeting({
 					adFree: false,
 					clientSideParticipations: {},
-					consentState: ccpaWithConsentMock,
+					consentState: usnatWithConsentMock,
 					isSignedIn: true,
 				}).permutive,
 			).toEqual(['1', '2', '3']);
@@ -612,7 +628,7 @@ describe('Build Page Targeting', () => {
 				buildPageTargeting({
 					adFree: false,
 					clientSideParticipations: {},
-					consentState: ccpaWithConsentMock,
+					consentState: usnatWithConsentMock,
 					isSignedIn: true,
 				}).fr,
 			).toEqual('5');
@@ -624,7 +640,7 @@ describe('Build Page Targeting', () => {
 				buildPageTargeting({
 					adFree: false,
 					clientSideParticipations: {},
-					consentState: ccpaWithConsentMock,
+					consentState: usnatWithConsentMock,
 					isSignedIn: true,
 				}).fr,
 			).toEqual('16-19');
@@ -636,7 +652,7 @@ describe('Build Page Targeting', () => {
 				buildPageTargeting({
 					adFree: false,
 					clientSideParticipations: {},
-					consentState: ccpaWithConsentMock,
+					consentState: usnatWithConsentMock,
 					isSignedIn: true,
 				}).fr,
 			).toEqual('30plus');
@@ -648,7 +664,7 @@ describe('Build Page Targeting', () => {
 				buildPageTargeting({
 					adFree: false,
 					clientSideParticipations: {},
-					consentState: ccpaWithConsentMock,
+					consentState: usnatWithConsentMock,
 					isSignedIn: true,
 				}).fr,
 			).toEqual('0');
@@ -660,7 +676,7 @@ describe('Build Page Targeting', () => {
 				buildPageTargeting({
 					adFree: false,
 					clientSideParticipations: {},
-					consentState: ccpaWithConsentMock,
+					consentState: usnatWithConsentMock,
 					isSignedIn: true,
 				}).fr,
 			).toEqual('0');
@@ -672,7 +688,7 @@ describe('Build Page Targeting', () => {
 				buildPageTargeting({
 					adFree: false,
 					clientSideParticipations: {},
-					consentState: ccpaWithoutConsentMock,
+					consentState: usnatWithoutConsentMock,
 					isSignedIn: true,
 				}).fr,
 			).toEqual('0');
@@ -902,8 +918,8 @@ describe('Build Page Targeting', () => {
 		});
 
 		it.each([
-			[ccpaWithConsentMock, '9'],
-			[ccpaWithoutConsentMock, '9'],
+			[usnatWithConsentMock, '9'],
+			[usnatWithoutConsentMock, '9'],
 
 			[ausWithConsentMock, '9'],
 			[ausWithoutConsentMock, '9'],
@@ -1126,7 +1142,7 @@ describe('Build Page Targeting', () => {
 			buildPageTargeting({
 				adFree: false,
 				clientSideParticipations: {},
-				consentState: ccpaWithConsentMock,
+				consentState: usnatWithConsentMock,
 				isSignedIn: true,
 			}).firstvisit,
 		).toBeUndefined();

diff --git a/src/core/targeting/personalised.spec.ts b/src/core/targeting/personalised.spec.ts
@@ -1,11 +1,21 @@
-import type { ConsentState } from '@guardian/libs';
+import type { ConsentState, USNATConsentState } from '@guardian/libs';
 import { storage } from '@guardian/libs';
 import type { PersonalisedTargeting } from './personalised';
 import { getPersonalisedTargeting } from './personalised';
 
 const FREQUENCY_KEY = 'gu.alreadyVisited';
 const AMTGRP_STORAGE_KEY = 'gu.adManagerGroup';
 
+const usnatConsent: USNATConsentState = {
+	doNotSell: false,
+	signalStatus: 'ready',
+};
+
+const usnatNonConsent: USNATConsentState = {
+	doNotSell: true,
+	signalStatus: 'ready',
+};
+
 describe('Personalised targeting', () => {
 	describe('TCFv2', () => {
 		test('Full consent', () => {
@@ -72,12 +82,13 @@ describe('Personalised targeting', () => {
 		});
 	});
 
-	describe('CCPA', () => {
+	describe('USNAT', () => {
 		it('Full Consent', () => {
 			const state: ConsentState = {
-				ccpa: { doNotSell: false, signalStatus: 'ready' },
+				ccpa: usnatConsent,
+				usnat: usnatConsent,
 				canTarget: true,
-				framework: 'ccpa',
+				framework: 'usnat',
 			};
 
 			storage.local.setRaw(FREQUENCY_KEY, '4');
@@ -97,9 +108,10 @@ describe('Personalised targeting', () => {
 
 		it('Do Not Sell', () => {
 			const state: ConsentState = {
-				ccpa: { doNotSell: true, signalStatus: 'ready' },
+				ccpa: usnatNonConsent,
+				usnat: usnatNonConsent,
 				canTarget: false,
-				framework: 'ccpa',
+				framework: 'usnat',
 			};
 
 			storage.local.setRaw(FREQUENCY_KEY, '4');
@@ -191,9 +203,10 @@ describe('Personalised targeting', () => {
 		];
 		test.each(frequencies)('Should get `%s` for %f', (fr, val) => {
 			const state: ConsentState = {
-				ccpa: { doNotSell: false, signalStatus: 'ready' },
+				ccpa: usnatConsent,
+				usnat: usnatConsent,
 				canTarget: true,
-				framework: 'ccpa',
+				framework: 'usnat',
 			};
 
 			storage.local.setRaw(FREQUENCY_KEY, String(val));
@@ -232,9 +245,10 @@ describe('Personalised targeting', () => {
 
 		test.each(groups)('Should get `%s` if it exists', (amtgrp, val) => {
 			const state: ConsentState = {
-				ccpa: { doNotSell: false, signalStatus: 'ready' },
+				ccpa: usnatConsent,
+				usnat: usnatConsent,
 				canTarget: true,
-				framework: 'ccpa',
+				framework: 'usnat',
 			};
 
 			storage.local.remove(AMTGRP_STORAGE_KEY);
@@ -277,11 +291,12 @@ describe('Personalised targeting', () => {
 			expect(storage.local.get(AMTGRP_STORAGE_KEY)).toBeNull();
 		});
 
-		test('Ad manager group IS set if ccpa and consent not given', () => {
+		test('Ad manager group IS set if usnat and consent not given', () => {
 			const state: ConsentState = {
-				ccpa: { doNotSell: true, signalStatus: 'ready' },
+				ccpa: usnatNonConsent,
+				usnat: usnatNonConsent,
 				canTarget: false,
-				framework: 'ccpa',
+				framework: 'usnat',
 			};
 
 			const targeting = getPersonalisedTargeting({
@@ -311,9 +326,10 @@ describe('Personalised targeting', () => {
 
 		test('Should set `permutive` to correct values if `youtube` is set to false', () => {
 			const state: ConsentState = {
-				ccpa: { doNotSell: false, signalStatus: 'ready' },
+				ccpa: usnatConsent,
+				usnat: usnatConsent,
 				canTarget: true,
-				framework: 'ccpa',
+				framework: 'usnat',
 			};
 
 			storage.local.setRaw(PERMUTIVE_KEY, '[1, 2, 3]');
@@ -328,9 +344,10 @@ describe('Personalised targeting', () => {
 
 		test('Should set `permutive` to correct values if `youtube` is set to true', () => {
 			const state: ConsentState = {
-				ccpa: { doNotSell: false, signalStatus: 'ready' },
+				ccpa: usnatConsent,
+				usnat: usnatConsent,
 				canTarget: true,
-				framework: 'ccpa',
+				framework: 'usnat',
 			};
 
 			storage.local.setRaw(PERMUTIVE_KEY, '[]');