Merge branch 'main' into storybook9

Author: DanielCliftonGuardian

.github/CODEOWNERS

@@ -27,3 +27,4 @@
 /dotcom-rendering/src/lib/braze/                @guardian/value
 /dotcom-rendering/webpack/                      @guardian/dotcom-platform
 /scripts/                                       @guardian/dotcom-platform
+/ab-testing/                                    @guardian/commercial-dev

ab-testing/README.md

@@ -63,6 +63,10 @@ To add a test where there is not enough space in the default audience space (`A`
 
 For example if there are already 3 25% tests in space `A` totalling 75%, and you want to run a 50% test, you can set the `audienceSpace` to `B` to allow this test to overlap with the existing tests.
 
+### Test Status
+
+Tests can be set to `ON` or `OFF` using the `status` field. Only tests with status `ON` will be validated and deployed.
+
 ## How it works
 
 The AB testing framework uses Deno to run scripts that validate and deploy the tests. The `deno.json` file contains the tasks that can be run, such as `validate`, `deploy`, and `build`.

ab-testing/abTest.ts

@@ -19,4 +19,8 @@ import type { ABTest } from './types';
  * - 100% Test	variant		MVT 500-999
  */
 
-export const ABTests: ABTest[] = [];
+const ABTests: ABTest[] = [];
+
+const activeABtests = ABTests.filter((test) => test.status === 'ON');
+
+export { ABTests as allABTests, activeABtests };

ab-testing/frontend/src/routes/+page.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { ABTests } from '../../../abTest';
+	import { allABTests, activeABtests } from '../../../abTest';
 	import Table from '$lib/components/TableFixed.svelte';
 	import AudienceBreakdown from '$lib/components/AudienceBreakdown.svelte';
 </script>
@@ -31,8 +31,8 @@
 	</p>
 </section>
 <section>
-	<AudienceBreakdown tests={ABTests} />
-	<Table tests={ABTests} />
+	<AudienceBreakdown tests={activeABtests} />
+	<Table tests={allABTests} />
 </section>
 
 <style>

ab-testing/index.ts

@@ -1,4 +1,3 @@
-// @ts-ignore - extension is required to import this as a package in DCR
-import { ABTests } from './abTest.ts';
+import { allABTests, activeABtests } from './abTest';
 
-export { ABTests };
+export { allABTests, activeABtests };

ab-testing/scripts/build/index.ts

@@ -1,10 +1,10 @@
-import { ABTests } from '../../abTest.ts';
 import { getMVTGroupsFromDictionary } from '../lib/fastly-api.ts';
 import { buildABTestGroupKeyValues } from './build-ab-tests-dict.ts';
 import { parseArgs } from 'jsr:@std/cli/parse-args';
 import { calculateAllSpaceUpdates } from './calculate-mvt-updates.ts';
 import { parseMVTValue, stringifyMVTValue } from '../lib/fastly-subfield.ts';
 import { dirname } from 'jsr:@std/path';
+import { activeABtests } from '../../abTest.ts';
 
 const flags = parseArgs(Deno.args, {
 	string: ['mvts', 'ab-tests'],
@@ -26,9 +26,9 @@ const mvtGroups = new Map(
 	}),
 );
 
-const abTestGroupKeyValues = buildABTestGroupKeyValues(ABTests);
+const abTestGroupKeyValues = buildABTestGroupKeyValues(activeABtests);
 
-const mvtIdKeyValues = calculateAllSpaceUpdates(mvtGroups, ABTests);
+const mvtIdKeyValues = calculateAllSpaceUpdates(mvtGroups, activeABtests);
 
 const mvtDictArray = Array.from(
 	mvtIdKeyValues.entries().map(([key, value]) => ({

ab-testing/scripts/validation/index.ts

@@ -1,5 +1,5 @@
-import { ABTests } from '../../abTest.ts';
 import { ABTest } from '../../types.ts';
+import { activeABtests } from '../../abTest.ts';
 import { enoughSpace } from './enoughSpace.ts';
 import { limitServerSideTests } from './limitServerSide.ts';
 import { uniqueName } from './uniqueName.ts';
@@ -19,7 +19,7 @@ function validateTests(testList: ABTest[]) {
 }
 
 try {
-	validateTests(ABTests);
+	validateTests(activeABtests);
 	console.log('AB test validations passed');
 } catch (err) {
 	const error = err as Error;

ab-testing/scripts/validation/validExpiration.ts

@@ -12,7 +12,7 @@ export function allExpirationsValid(tests: ABTest[]): boolean {
 		throw new Error(
 			`${
 				test.name
-			} has an expiration date in the past: ${expires.toISOString()}, has it expired?`,
+			} has an expiration date in the past: ${expires.toISOString()}, has it expired? If it doesn't belong to you or your team, you can set the status to OFF for now.`,
 		);
 	});
 }

dotcom-rendering/package.json

@@ -32,14 +32,14 @@
 		"@guardian/bridget": "8.7.0",
 		"@guardian/browserslist-config": "6.1.0",
 		"@guardian/cdk": "62.0.1",
-		"@guardian/commercial-core": "28.0.0",
+		"@guardian/commercial-core": "29.0.0",
 		"@guardian/core-web-vitals": "7.0.0",
 		"@guardian/eslint-config-typescript": "11.0.0",
 		"@guardian/identity-auth": "6.0.1",
 		"@guardian/identity-auth-frontend": "8.1.0",
 		"@guardian/libs": "26.0.1",
 		"@guardian/ophan-tracker-js": "2.6.1",
-		"@guardian/react-crossword": "6.3.0",
+		"@guardian/react-crossword": "11.1.0",
 		"@guardian/shimport": "1.0.2",
 		"@guardian/source": "11.3.0",
 		"@guardian/source-development-kitchen": "18.1.1",
@@ -54,8 +54,8 @@
 		"@swc/cli": "0.7.8",
 		"@swc/core": "1.13.5",
 		"@swc/jest": "0.2.39",
-		"@testing-library/dom": "10.4.0",
-		"@testing-library/jest-dom": "6.6.3",
+		"@testing-library/dom": "10.4.1",
+		"@testing-library/jest-dom": "6.9.1",
 		"@testing-library/react": "16.3.0",
 		"@testing-library/user-event": "14.6.1",
 		"@types/body-parser": "1.19.2",

dotcom-rendering/playwright/tests/commercial.e2e.spec.ts

@@ -13,14 +13,13 @@ test.describe('Commercial E2E tests', () => {
 		await cmpAcceptAll(page);
 
 		const fixedSlots = [
-			'carrot', // Not used often, likely to be unfilled
 			'right',
 			'merchandising-high',
 			'mostpop',
 			'merchandising',
 		];
 
-		const totalSlotsExpected = 16; // All slots, even if unfilled ie. `display: none`
+		const totalSlotsExpected = 15; // All slots, even if unfilled ie. `display: none`
 		const inlineSlots = totalSlotsExpected - fixedSlots.length;
 
 		// We are excluding survey slot as they can be switched off