Merge branch 'main' into ahe/remove-amazon-pay

guardian · Jan 17, 2025 · e657cca · e657cca
2 parents f57ce25 + 33ba1f5
commit e657cca
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/support-frontend/assets/helpers/abTests/__tests__/abtestTest.ts b/support-frontend/assets/helpers/abTests/__tests__/abtestTest.ts
@@ -472,6 +472,29 @@ describe('init', () => {
 			});
 			expect(participations.t1).toBeUndefined();
 		});
+
+		it(`does not assign a user to a test if audiences is CONTRIBUTIONS_ONLY and selectedAmountsVariant is undefined`, () => {
+			const abTests = {
+				t1: buildTest({
+					variants: [
+						buildVariant({ id: 'control' }),
+						buildVariant({ id: 'variant' }),
+					],
+					audiences: {
+						CONTRIBUTIONS_ONLY: {
+							offset: 0,
+							size: 1,
+						},
+					},
+				}),
+			};
+			const participations: Participations = abInit({
+				...abtestInitalizerData,
+				abTests,
+				selectedAmountsVariant: undefined,
+			});
+			expect(participations.t1).toBeUndefined();
+		});
 	});
 
 	describe('path matching', () => {

diff --git a/support-frontend/assets/helpers/abTests/abtest.ts b/support-frontend/assets/helpers/abTests/abtest.ts
@@ -203,7 +203,7 @@ function getParticipations(
 			!!test.audiences.CONTRIBUTIONS_ONLY;
 
 		/**
-		 * We only exclude users assigned to the contributions only amounts test
+		 * Exclude any users assigned to the contributions only amounts test
 		 * from an ab test if the ab test definition has excludeContributionsOnlyCountries as true
 		 * AND includeOnlyContributionsOnlyCountries is not true
 		 */
@@ -216,7 +216,7 @@ function getParticipations(
 		}
 
 		/**
-		 * Exclude users NOT assigned to the contributions only amounts test
+		 * Exclude defined users NOT assigned to the contributions only amounts test
 		 * if the  the ab test definition has includeOnlyContributionsOnlyCountries as true
 		 */
 		if (
@@ -347,7 +347,7 @@ function getAmountsTestVariant(
 		// Check if we actually want to track this test
 		const pathMatches = targetPageMatches(
 			path,
-			'/??/contribute|thankyou(/.*)?$',
+			'/??/checkout|one-time-checkout|contribute|thankyou(/.*)?$',
 		);
 
 		if (pathMatches && test.variants.length > 1 && test.isLive) {

diff --git a/support-frontend/assets/helpers/abTests/abtestDefinitions.ts b/support-frontend/assets/helpers/abTests/abtestDefinitions.ts
@@ -152,7 +152,7 @@ export const tests: Tests = {
 				size: 1,
 			},
 		},
-		isActive: false,
+		isActive: true,
 		referrerControlled: false, // ab-test name not needed to be in paramURL
 		seed: 9,
 		targetPage: pageUrlRegexes.contributions.allLandingPagesAndThankyouPages,

diff --git a/support-frontend/assets/helpers/page/page.ts b/support-frontend/assets/helpers/page/page.ts
@@ -27,17 +27,15 @@ function getAbParticipations(): Participations {
 	const settings = getSettings();
 	const countryId: IsoCountry = Country.detect();
 	const countryGroupId: CountryGroupId = CountryGroup.detect();
+	const { amountsParticipation, selectedAmountsVariant } =
+		getAmountsTestVariant(countryId, countryGroupId, settings);
 	const abtestInitalizerData = {
 		countryId,
 		countryGroupId,
+		selectedAmountsVariant,
 	};
-
 	const participations: Participations = abTest.init(abtestInitalizerData);
-	const { amountsParticipation } = getAmountsTestVariant(
-		countryId,
-		countryGroupId,
-		settings,
-	);
+
 	return {
 		...participations,
 		...amountsParticipation,