Skip to content

Commit 688e13f

Browse files
domlanderdomlander
authored
Merge pull request #14441 from guardian/doml/remove-looping-video-test
Remove looping video AB test
2 parents de8b74f + cb2997a commit 688e13f

13 files changed

+5
-127
lines changed

‎dotcom-rendering/src/components/Card/Card.tsx

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ export type Props = {
153153
showKickerImage?: boolean;
154154
/** Determines if the headline should be positioned within the content or outside the content */
155155
headlinePosition?: 'inner' | 'outer';
156-
isInLoopingVideoTestVariant?: boolean;
157-
isInLoopingVideoTestControl?: boolean;
158156
};
159157

160158
const starWrapper = (cardHasImage: boolean) => css`
@@ -258,7 +256,6 @@ const getMedia = ({
258256
mainMedia,
259257
canPlayInline,
260258
isBetaContainer,
261-
isInLoopingVideoTestControl,
262259
}: {
263260
imageUrl?: string;
264261
imageAltText?: string;
@@ -268,13 +265,8 @@ const getMedia = ({
268265
mainMedia?: MainMedia;
269266
canPlayInline?: boolean;
270267
isBetaContainer: boolean;
271-
isInLoopingVideoTestControl: boolean;
272268
}) => {
273-
if (
274-
mainMedia?.type === 'LoopVideo' &&
275-
!isInLoopingVideoTestControl &&
276-
canPlayInline
277-
) {
269+
if (mainMedia?.type === 'LoopVideo' && canPlayInline) {
278270
return {
279271
type: 'loop-video',
280272
mainMedia,
@@ -398,8 +390,6 @@ export const Card = ({
398390
trailTextSize,
399391
showKickerImage = false,
400392
headlinePosition = 'inner',
401-
isInLoopingVideoTestVariant = false,
402-
isInLoopingVideoTestControl = false,
403393
}: Props) => {
404394
const hasSublinks = supportingContent && supportingContent.length > 0;
405395
const sublinkPosition = decideSublinkPosition(
@@ -552,7 +542,6 @@ export const Card = ({
552542
mainMedia,
553543
canPlayInline,
554544
isBetaContainer,
555-
isInLoopingVideoTestControl,
556545
});
557546

558547
const resolvedDataLinkName =
@@ -872,9 +861,6 @@ export const Card = ({
872861
fallbackImageAlt={media.imageAltText}
873862
fallbackImageAspectRatio="5:4"
874863
linkTo={linkTo}
875-
isInLoopingVideoTestVariant={
876-
isInLoopingVideoTestVariant
877-
}
878864
/>
879865
</Island>
880866
)}
@@ -988,9 +974,6 @@ export const Card = ({
988974
loading={imageLoading}
989975
roundedCorners={isOnwardContent}
990976
aspectRatio={aspectRatio}
991-
isInLoopingVideoTestControl={
992-
isInLoopingVideoTestControl
993-
}
994977
/>
995978
{isVideoMainMedia && mainMedia.duration > 0 && (
996979
<div

‎dotcom-rendering/src/components/CardPicture.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export type Props = {
1818
isCircular?: boolean;
1919
aspectRatio?: AspectRatio;
2020
mobileAspectRatio?: AspectRatio;
21-
isInLoopingVideoTestControl?: boolean;
2221
};
2322

2423
/**
@@ -211,7 +210,6 @@ export const CardPicture = ({
211210
isCircular,
212211
aspectRatio = '5:3',
213212
mobileAspectRatio,
214-
isInLoopingVideoTestControl,
215213
}: Props) => {
216214
if (mainImage === '') {
217215
return null;
@@ -226,11 +224,6 @@ export const CardPicture = ({
226224

227225
return (
228226
<picture
229-
data-component={
230-
isInLoopingVideoTestControl
231-
? 'loop-video-player-control'
232-
: undefined
233-
}
234227
data-size={imageSize}
235228
css={[
236229
block,

‎dotcom-rendering/src/components/DecideContainer.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ type Props = {
4747
frontId?: string;
4848
collectionId: number;
4949
containerLevel?: DCRContainerLevel;
50-
isInLoopingVideoTestVariant?: boolean;
51-
isInLoopingVideoTestControl?: boolean;
5250
};
5351

5452
export const DecideContainer = ({
@@ -64,8 +62,6 @@ export const DecideContainer = ({
6462
frontId,
6563
collectionId,
6664
containerLevel,
67-
isInLoopingVideoTestVariant,
68-
isInLoopingVideoTestControl,
6965
}: Props) => {
7066
switch (containerType) {
7167
case 'dynamic/fast':
@@ -248,8 +244,6 @@ export const DecideContainer = ({
248244
imageLoading={imageLoading}
249245
aspectRatio={aspectRatio}
250246
collectionId={collectionId}
251-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
252-
isInLoopingVideoTestControl={isInLoopingVideoTestControl}
253247
/>
254248
);
255249
case 'flexible/general':
@@ -263,8 +257,6 @@ export const DecideContainer = ({
263257
aspectRatio={aspectRatio}
264258
containerLevel={containerLevel}
265259
collectionId={collectionId}
266-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
267-
isInLoopingVideoTestControl={isInLoopingVideoTestControl}
268260
/>
269261
);
270262
case 'scrollable/small':

‎dotcom-rendering/src/components/FlexibleGeneral.tsx

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ type Props = {
3232
aspectRatio: AspectRatio;
3333
containerLevel?: DCRContainerLevel;
3434
collectionId: number;
35-
isInLoopingVideoTestVariant?: boolean;
36-
isInLoopingVideoTestControl?: boolean;
3735
};
3836

3937
type RowLayout = 'oneCardHalfWidth' | 'oneCardFullWidth' | 'twoCard';
@@ -243,8 +241,6 @@ type SplashCardLayoutProps = {
243241
isLastRow: boolean;
244242
containerLevel: DCRContainerLevel;
245243
collectionId: number;
246-
isInLoopingVideoTestVariant?: boolean;
247-
isInLoopingVideoTestControl?: boolean;
248244
};
249245

250246
const SplashCardLayout = ({
@@ -257,8 +253,6 @@ const SplashCardLayout = ({
257253
isLastRow,
258254
containerLevel,
259255
collectionId,
260-
isInLoopingVideoTestVariant = false,
261-
isInLoopingVideoTestControl = false,
262256
}: SplashCardLayoutProps) => {
263257
const card = cards[0];
264258
if (!card) return null;
@@ -340,8 +334,6 @@ const SplashCardLayout = ({
340334
canPlayInline={true}
341335
showKickerImage={card.format.design === ArticleDesign.Audio}
342336
headlinePosition={card.showLivePlayable ? 'outer' : 'inner'}
343-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
344-
isInLoopingVideoTestControl={isInLoopingVideoTestControl}
345337
/>
346338
</LI>
347339
</UL>
@@ -404,8 +396,6 @@ type FullWidthCardLayoutProps = {
404396
isLastRow: boolean;
405397
containerLevel: DCRContainerLevel;
406398
collectionId: number;
407-
isInLoopingVideoTestVariant?: boolean;
408-
isInLoopingVideoTestControl?: boolean;
409399
};
410400

411401
const FullWidthCardLayout = ({
@@ -419,8 +409,6 @@ const FullWidthCardLayout = ({
419409
isLastRow,
420410
containerLevel,
421411
collectionId,
422-
isInLoopingVideoTestVariant = false,
423-
isInLoopingVideoTestControl = false,
424412
}: FullWidthCardLayoutProps) => {
425413
const card = cards[0];
426414
if (!card) return null;
@@ -493,8 +481,6 @@ const FullWidthCardLayout = ({
493481
liveUpdatesPosition={liveUpdatesPosition}
494482
canPlayInline={true}
495483
showKickerImage={card.format.design === ArticleDesign.Audio}
496-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
497-
isInLoopingVideoTestControl={isInLoopingVideoTestControl}
498484
/>
499485
</LI>
500486
</UL>
@@ -595,8 +581,6 @@ export const FlexibleGeneral = ({
595581
aspectRatio,
596582
containerLevel = 'Primary',
597583
collectionId,
598-
isInLoopingVideoTestVariant = false,
599-
isInLoopingVideoTestControl = false,
600584
}: Props) => {
601585
const splash = [...groupedTrails.splash].slice(0, 1).map((snap) => ({
602586
...snap,
@@ -625,8 +609,6 @@ export const FlexibleGeneral = ({
625609
isLastRow={cards.length === 0}
626610
containerLevel={containerLevel}
627611
collectionId={collectionId}
628-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
629-
isInLoopingVideoTestControl={isInLoopingVideoTestControl}
630612
/>
631613
)}
632614
{groupedCards.map((row, i) => {
@@ -645,12 +627,6 @@ export const FlexibleGeneral = ({
645627
isLastRow={i === groupedCards.length - 1}
646628
containerLevel={containerLevel}
647629
collectionId={collectionId}
648-
isInLoopingVideoTestVariant={
649-
isInLoopingVideoTestVariant
650-
}
651-
isInLoopingVideoTestControl={
652-
isInLoopingVideoTestControl
653-
}
654630
/>
655631
);
656632

‎dotcom-rendering/src/components/FlexibleSpecial.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ type Props = {
3030
aspectRatio: AspectRatio;
3131
containerLevel?: DCRContainerLevel;
3232
collectionId: number;
33-
isInLoopingVideoTestVariant?: boolean;
34-
isInLoopingVideoTestControl?: boolean;
3533
};
3634

3735
type BoostProperties = {
@@ -128,8 +126,6 @@ type OneCardLayoutProps = {
128126
isFirstRow: boolean;
129127
containerLevel: DCRContainerLevel;
130128
isSplashCard?: boolean;
131-
isInLoopingVideoTestVariant?: boolean;
132-
isInLoopingVideoTestControl?: boolean;
133129
};
134130

135131
export const OneCardLayout = ({
@@ -143,8 +139,6 @@ export const OneCardLayout = ({
143139
isFirstRow,
144140
containerLevel,
145141
isSplashCard,
146-
isInLoopingVideoTestVariant = false,
147-
isInLoopingVideoTestControl = false,
148142
}: OneCardLayoutProps) => {
149143
const card = cards[0];
150144
if (!card) return null;
@@ -195,8 +189,6 @@ export const OneCardLayout = ({
195189
canPlayInline={true}
196190
showKickerImage={card.format.design === ArticleDesign.Audio}
197191
headlinePosition={isSplashCard ? 'outer' : 'inner'}
198-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
199-
isInLoopingVideoTestControl={isInLoopingVideoTestControl}
200192
/>
201193
</LI>
202194
</UL>
@@ -293,8 +285,6 @@ export const FlexibleSpecial = ({
293285
aspectRatio,
294286
containerLevel = 'Primary',
295287
collectionId,
296-
isInLoopingVideoTestVariant,
297-
isInLoopingVideoTestControl,
298288
}: Props) => {
299289
const snaps = [...groupedTrails.snap].slice(0, 1).map((snap) => ({
300290
...snap,
@@ -323,8 +313,6 @@ export const FlexibleSpecial = ({
323313
isLastRow={splash.length === 0 && cards.length === 0}
324314
containerLevel={containerLevel}
325315
isSplashCard={false}
326-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
327-
isInLoopingVideoTestControl={isInLoopingVideoTestControl}
328316
/>
329317
)}
330318
{isNonEmptyArray(splash) && (
@@ -339,8 +327,6 @@ export const FlexibleSpecial = ({
339327
isFirstRow={!isNonEmptyArray(snaps)}
340328
containerLevel={containerLevel}
341329
isSplashCard={true}
342-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
343-
isInLoopingVideoTestControl={isInLoopingVideoTestControl}
344330
/>
345331
)}
346332

‎dotcom-rendering/src/components/LoopVideo.importable.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ type Props = {
117117
fallbackImageAlt: CardPictureProps['alt'];
118118
fallbackImageAspectRatio: CardPictureProps['aspectRatio'];
119119
linkTo: string;
120-
isInLoopingVideoTestVariant?: boolean;
121120
};
122121

123122
export const LoopVideo = ({
@@ -133,7 +132,6 @@ export const LoopVideo = ({
133132
fallbackImageAlt,
134133
fallbackImageAspectRatio,
135134
linkTo,
136-
isInLoopingVideoTestVariant,
137135
}: Props) => {
138136
const adapted = useShouldAdapt();
139137
const { renderingTarget } = useConfig();
@@ -604,7 +602,6 @@ export const LoopVideo = ({
604602
AudioIcon={hasAudio ? AudioIcon : null}
605603
preloadPartialData={preloadPartialData}
606604
showPlayIcon={showPlayIcon}
607-
isInLoopingVideoTestVariant={isInLoopingVideoTestVariant}
608605
/>
609606
</figure>
610607
);

‎dotcom-rendering/src/components/LoopVideoPlayer.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ type Props = {
9696
posterImage?: string;
9797
preloadPartialData: boolean;
9898
showPlayIcon: boolean;
99-
isInLoopingVideoTestVariant?: boolean;
10099
};
101100

102101
/**
@@ -128,7 +127,6 @@ export const LoopVideoPlayer = forwardRef(
128127
AudioIcon,
129128
preloadPartialData,
130129
showPlayIcon,
131-
isInLoopingVideoTestVariant,
132130
}: Props,
133131
ref: React.ForwardedRef<HTMLVideoElement>,
134132
) => {
@@ -149,11 +147,6 @@ export const LoopVideoPlayer = forwardRef(
149147
showPlayIcon ? 'play' : 'pause'
150148
}-${atomId}`}
151149
data-chromatic="ignore"
152-
data-component={
153-
isInLoopingVideoTestVariant
154-
? 'loop-video-player-variant'
155-
: undefined
156-
}
157150
preload={preloadPartialData ? 'metadata' : 'none'}
158151
loop={true}
159152
muted={isMuted}

‎dotcom-rendering/src/layouts/FrontLayout.tsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ export const FrontLayout = ({ front, NAV }: Props) => {
136136

137137
const contributionsServiceUrl = getContributionsServiceUrl(front);
138138

139-
const isInLoopingVideoTestVariant =
140-
abTests.loopingVideoVariant === 'variant';
141-
const isInLoopingVideoTestControl =
142-
abTests.loopingVideoControl === 'control';
143-
144139
const fallbackAspectRatio = (collectionType: DCRContainerType) => {
145140
switch (collectionType) {
146141
case 'scrollable/feature':
@@ -639,12 +634,6 @@ export const FrontLayout = ({ front, NAV }: Props) => {
639634
sectionId={ophanName}
640635
collectionId={index + 1}
641636
containerLevel={collection.containerLevel}
642-
isInLoopingVideoTestVariant={
643-
isInLoopingVideoTestVariant
644-
}
645-
isInLoopingVideoTestControl={
646-
isInLoopingVideoTestControl
647-
}
648637
/>
649638
</FrontSection>
650639

‎dotcom-rendering/src/model/enhanceCards.test.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { getActiveMediaAtom } from './enhanceCards';
33

44
describe('Enhance Cards', () => {
55
it('filters out m3u8 assets until supported by DCR', () => {
6-
const isLoopingVideoTest = true;
76
const videoReplace = true;
87
const assets: FEMediaAsset[] = [
98
{
@@ -33,12 +32,7 @@ describe('Enhance Cards', () => {
3332
const cardTrailImage = '';
3433

3534
expect(
36-
getActiveMediaAtom(
37-
isLoopingVideoTest,
38-
videoReplace,
39-
mediaAtom,
40-
cardTrailImage,
41-
),
35+
getActiveMediaAtom(videoReplace, mediaAtom, cardTrailImage),
4236
).toEqual({
4337
atomId: 'atomID',
4438
duration: 15,

0 commit comments

Comments
 (0)