Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ module.exports = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/cricket-match.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1884,7 +1884,6 @@ export const cricketMatchData: FECricketMatchPage = {
shouldLoadGoogletag: true,
inizio: true,
},
abTests: {},
serverSideABTests: {},
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
stage: 'PROD',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4080,7 +4080,6 @@ export const AffiliateProductShowcase: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2723,7 +2723,6 @@ export const AffiliateProductStandard: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,6 @@ export const Analysis: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Audio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,6 @@ export const Audio: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Comment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,6 @@ export const Comment: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Dead.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3192,7 +3192,6 @@ export const Dead: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,6 @@ export const Editorial: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1540,7 +1540,6 @@ export const Explainer: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Feature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,6 @@ export const Feature: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Gallery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6806,7 +6806,6 @@ export const Gallery: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4405,7 +4405,6 @@ export const GalleryLabs: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2382,7 +2382,6 @@ export const Interview: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Labs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1761,7 +1761,6 @@ export const Labs: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Letter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,6 @@ export const Letter: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Live.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3192,7 +3192,6 @@ export const Live: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4389,7 +4389,6 @@ export const LiveBlogSingleContributor: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,6 @@ export const MatchReport: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,6 @@ export const NewsletterSignup: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5917,7 +5917,6 @@ export const NumberedList: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7780,7 +7780,6 @@ export const PhotoEssay: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Picture.ts
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,6 @@ export const Picture: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Quiz.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,6 @@ export const Quiz: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Recipe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,6 @@ export const Recipe: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Review.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,6 @@ export const Review: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,6 @@ export const SpecialReport: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,6 @@ export const Standard: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,6 @@ export const StandardWithVideo: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/generated/fe-articles/Video.ts
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ export const Video: FEArticle = {
pageId: 'environment/2020/feb/10/fires-floods-maps-europe-climate-catastrophe',
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
mmaUrl: 'https://manage.theguardian.com',
abTests: {},
serverSideABTests: {},
edition: 'UK',
ipsosTag: 'environment',
Expand Down
3 changes: 0 additions & 3 deletions dotcom-rendering/fixtures/generated/football-live.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1048,9 +1048,6 @@ export const footballData: FEFootballMatchListPage = {
europeBetaFront: true,
prebidBidCache: true,
},
abTests: {
europeBetaFrontTest2Variant: 'variant',
},
serverSideABTests: {},
googletagUrl: '//securepubads.g.doubleclick.net/tag/js/gpt.js',
stage: 'PROD',
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/manual/hostedArticle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,6 @@ export const hostedArticle: FEArticle = {
shouldLoadGoogletag: true,
inizio: true,
},
abTests: {},
serverSideABTests: {
'thefilter-at-a-glance-redesign-v2': 'stacked-default',
},
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/manual/hostedGallery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2932,7 +2932,6 @@ export const hostedGallery: FEArticle = {
shouldLoadGoogletag: true,
inizio: true,
},
abTests: {},
serverSideABTests: {
'commercial-hosted-gallery': 'preview',
},
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/fixtures/manual/hostedVideo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ export const hostedVideo: FEArticle = {
shouldLoadGoogletag: true,
inizio: true,
},
abTests: {},
serverSideABTests: {
'thefilter-at-a-glance-redesign-v2': 'stacked-default',
},
Expand Down
1 change: 0 additions & 1 deletion dotcom-rendering/scripts/jest/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const windowGuardianConfig = {
browserId: 'jest-browser-id',
pageViewId: 'jest-page-view-id',
},
tests: {},
switches: {},
} as Guardian['config'];

Expand Down
13 changes: 0 additions & 13 deletions dotcom-rendering/src/client/adaptiveSite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,6 @@ export const shouldAdapt = async (): Promise<boolean> => {
if (!window.guardian.config.switches.adaptiveSite) return false;
if (window.location.host !== 'www.theguardian.com') return false;

/**
* The europe beta front is being served to a 0% audience. This means it's rarely in cache and so it gets adapted more often.
* This is a temporary measure to ensure that the front is not adapted during testing.
*/
if (
(window.guardian.config.tests.europeBetaFrontVariant === 'variant' ||
window.guardian.config.tests.europeBetaFrontTest2Variant ===
'variant') &&
window.location.pathname === '/europe'
) {
return false;
}

// only evaluate this code if we want to adapt in response to page performance
const { isPerformingPoorly } = await import(
/* webpackMode: "eager" */ './poorPerformanceMonitoring'
Expand Down
5 changes: 1 addition & 4 deletions dotcom-rendering/src/client/sentryLoader/sentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@ Sentry.init({
// sampleRate: // We use Math.random in init.ts to sample errors
});

if (
BUILD_VARIANT &&
window.guardian.config.tests[dcrJavascriptBundle('Variant')] === 'variant'
) {
if (BUILD_VARIANT) {
Sentry.setTag('dcr.bundle', dcrJavascriptBundle('Variant'));
}

Expand Down
7 changes: 3 additions & 4 deletions dotcom-rendering/src/client/sentryLoader/sentryLoader.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BUILD_VARIANT, dcrJavascriptBundle } from '../../../webpack/bundles';
import { BUILD_VARIANT } from '../../../webpack/bundles';
import { loadSentryOnError } from './loadSentry';

type IsSentryEnabled = {
Expand Down Expand Up @@ -46,10 +46,9 @@ const stubSentry = (): void => {
};

export const sentryLoader = (): Promise<void> => {
const { switches, isDev, tests } = window.guardian.config;
const { switches, isDev } = window.guardian.config;
const enableSentryReporting = !!switches.enableSentryReporting;
const isInBrowserVariantTest =
BUILD_VARIANT && tests[dcrJavascriptBundle('Variant')] === 'variant';
const isInBrowserVariantTest = BUILD_VARIANT;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure this makes much sense any more. It looks like this was a test run years ago and isn't running any more. Maybe we could strip out all variant bundle logic entirely. Or perhaps rename this value as it no longer really makes sense


const canLoadSentry = isSentryEnabled({
enableSentryReporting,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ const setAllBenefitsData = (opts: { isExpired: boolean }) => {

beforeAll(() => {
window.guardian.config.page.userBenefitsApiUrl = 'fake-url';
window.guardian.config.tests['useUserBenefitsApiVariant'] = 'variant';
});

const expectUserBenefitExpiryCookieHasBeenSetCorrectly = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export const AllEditorialNewslettersPage = ({
commercialMetricsEnabled={
!!newslettersPage.config.switches.commercialMetrics
}
tests={newslettersPage.config.abTests}
/>
</Island>
<AllEditorialNewslettersPageLayout
Expand Down
6 changes: 1 addition & 5 deletions dotcom-rendering/src/components/ArticleBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { revealStyles } from '../lib/revealStyles';
import type { TableOfContentsItem } from '../model/enhanceTableOfContents';
import { palette as themePalette } from '../palette';
import type { Block } from '../types/blocks';
import type { ServerSideTests, Switches } from '../types/config';
import type { Switches } from '../types/config';
import type { TagType } from '../types/tag';
import { Island } from './Island';
import { LiveBlogRenderer } from './LiveBlogRenderer';
Expand Down Expand Up @@ -49,7 +49,6 @@ type Props = {
isDev: boolean;
onFirstPage?: boolean;
keyEvents?: Block[];
abTests: ServerSideTests;
tableOfContents?: TableOfContentsItem[];
lang?: string;
isRightToLeftLang?: boolean;
Expand Down Expand Up @@ -139,7 +138,6 @@ export const ArticleBody = ({
onFirstPage = false,
keyEvents = [],
keywordIds,
abTests,
tableOfContents,
lang,
isRightToLeftLang = false,
Expand Down Expand Up @@ -203,7 +201,6 @@ export const ArticleBody = ({
pageId={pageId}
webTitle={webTitle}
ajaxUrl={ajaxUrl}
abTests={abTests}
switches={switches}
isAdFreeUser={isAdFreeUser}
isSensitive={isSensitive}
Expand Down Expand Up @@ -265,7 +262,6 @@ export const ArticleBody = ({
isDev={isDev}
isAdFreeUser={isAdFreeUser}
isSensitive={isSensitive}
abTests={abTests}
editionId={editionId}
contributionsServiceUrl={contributionsServiceUrl}
shouldHideAds={shouldHideAds}
Expand Down
Loading
Loading