Merge pull request #11403 from guardian/ei/remove-commercial-mega-test

Remove commercial mega test

dotcom-rendering/src/lib/article.ts

@@ -6,15 +6,13 @@ import { enhanceCommercialProperties } from '../model/enhanceCommercialPropertie
 import { enhanceStandfirst } from '../model/enhanceStandfirst';
 import { enhanceTableOfContents } from '../model/enhanceTableOfContents';
 import { validateAsArticleType } from '../model/validate';
-import type { ServerSideTests } from '../types/config';
 import { type DCRArticle } from '../types/frontend';
 import { type RenderingTarget } from '../types/renderingTarget';
 import { decideFormat } from './decideFormat';
 
 const enhancePinnedPost = (
 	format: ArticleFormat,
 	renderingTarget: RenderingTarget,
-	abTests: ServerSideTests,
 	block?: Block,
 ) => {
 	if (!block) return;
@@ -24,7 +22,6 @@ const enhancePinnedPost = (
 		imagesForLightbox: [],
 		promotedNewsletter: undefined,
 		hasAffiliateLinksDisclaimer: false,
-		abTests,
 	})[0];
 };
 
@@ -44,7 +41,6 @@ export const enhanceArticleType = (
 		promotedNewsletter: data.promotedNewsletter,
 		imagesForLightbox,
 		hasAffiliateLinksDisclaimer: !!data.affiliateLinksDisclaimer,
-		abTests: data.config.abTests,
 	});
 
 	const mainMediaElements = enhanceMainMedia(
@@ -57,12 +53,7 @@ export const enhanceArticleType = (
 		...data,
 		mainMediaElements,
 		blocks: enhancedBlocks,
-		pinnedPost: enhancePinnedPost(
-			format,
-			renderingTarget,
-			data.config.abTests,
-			data.pinnedPost,
-		),
+		pinnedPost: enhancePinnedPost(format, renderingTarget, data.pinnedPost),
 		standfirst: enhanceStandfirst(data.standfirst),
 		commercialProperties: enhanceCommercialProperties(
 			data.commercialProperties,

dotcom-rendering/src/model/enhanceBlocks.ts

@@ -1,9 +1,7 @@
 import { type ArticleFormat } from '@guardian/libs';
-import type { ServerSideTests } from '../types/config';
 import type { FEElement, ImageForLightbox, Newsletter } from '../types/content';
 import type { RenderingTarget } from '../types/renderingTarget';
 import { enhanceAdPlaceholders } from './enhance-ad-placeholders';
-import { enhanceAdPlaceholders as enhanceAdPlaceholders_AB_TEST_CONTROL } from './enhance-ad-placeholders_AB_TEST_CONTROL';
 import { enhanceBlockquotes } from './enhance-blockquotes';
 import { enhanceDisclaimer } from './enhance-disclaimer';
 import { enhanceDividers } from './enhance-dividers';
@@ -24,7 +22,6 @@ type Options = {
 	promotedNewsletter: Newsletter | undefined;
 	imagesForLightbox: ImageForLightbox[];
 	hasAffiliateLinksDisclaimer: boolean;
-	abTests: ServerSideTests;
 };
 
 const enhanceNewsletterSignup =
@@ -48,8 +45,8 @@ const enhanceNewsletterSignup =
 // as they both effect SubheadingBlockElement
 export const enhanceElements =
 	(format: ArticleFormat, blockId: string, options: Options) =>
-	(elements: FEElement[]): FEElement[] => {
-		return [
+	(elements: FEElement[]): FEElement[] =>
+		[
 			enhanceLists(enhanceElements(format, blockId, options)),
 			enhanceTimeline(enhanceElements(format, blockId, options)),
 			enhanceDividers,
@@ -66,18 +63,12 @@ export const enhanceElements =
 				options.promotedNewsletter,
 				blockId,
 			),
-			options.abTests.commercialMegaTestControl === 'control'
-				? enhanceAdPlaceholders_AB_TEST_CONTROL(
-						format,
-						options.renderingTarget,
-				  )
-				: enhanceAdPlaceholders(format, options.renderingTarget),
+			enhanceAdPlaceholders(format, options.renderingTarget),
 			enhanceDisclaimer(options.hasAffiliateLinksDisclaimer),
 		].reduce(
 			(enhancedBlocks, enhancer) => enhancer(enhancedBlocks),
 			elements,
 		);
-	};
 
 export const enhanceMainMedia =
 	(

dotcom-rendering/src/server/handler.article.web.ts

@@ -77,7 +77,6 @@ export const handleBlocks: RequestHandler = ({ body }, res) => {
 		promotedNewsletter: undefined,
 		imagesForLightbox: [],
 		hasAffiliateLinksDisclaimer: false,
-		abTests: abTests ?? {},
 	});
 	const html = renderBlocks({
 		blocks: enhancedBlocks,