Skip to content

Commit 3d641b9

Browse files
georgerichmondgeorgerichmond
authored
Merge branch 'main' into 1024-bug-newsletter-in-article-signup-card-styling-issue-on-small-devices
2 parents e96805d + 9df1a45 commit 3d641b9

25 files changed

Lines changed: 1249 additions & 658 deletions

‎ab-testing/config/abTests.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,18 @@ const ABTests: ABTest[] = [
206206
groups: ["enable"],
207207
shouldForceMetricsCollection: false,
208208
},
209+
{
210+
name: "commercial-mobile-above-nav-test",
211+
description: "Test adding the mobile-above-nav ad slot to mobile pages",
212+
owners: ["commercial.dev@guardian.co.uk"],
213+
expirationDate: "2026-10-30",
214+
type: "server",
215+
status: "ON",
216+
audienceSize: 0 / 100,
217+
audienceSpace: "B",
218+
groups: ["control", "variant"],
219+
shouldForceMetricsCollection: true,
220+
},
209221
{
210222
name: "commercial-rich-links",
211223
description:
@@ -219,6 +231,26 @@ const ABTests: ABTest[] = [
219231
groups: ["control", "variant"],
220232
shouldForceMetricsCollection: true,
221233
},
234+
{
235+
name: "commercial-header-bidder-timeouts",
236+
description:
237+
"Test to measure the impact of changing the Prebid and APS timeout value.",
238+
owners: ["commercial.dev@guardian.co.uk"],
239+
expirationDate: "2026-10-28",
240+
type: "client",
241+
status: "ON",
242+
audienceSize: 0 / 100,
243+
audienceSpace: "A",
244+
groups: [
245+
"variant-500",
246+
"variant-750",
247+
"variant-1000",
248+
"variant-1250",
249+
"control", // 1500ms timeout
250+
"variant-1650",
251+
],
252+
shouldForceMetricsCollection: true,
253+
},
222254
];
223255

224256
const activeABtests = ABTests.filter((test) => test.status === "ON");

‎dotcom-rendering/fixtures/manual/electionTrackers/euParliament.ts‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
export const euParliament = {
2+
components: [
3+
{
4+
kind: 'stackedProgress',
5+
props: {
6+
total: 720,
7+
label: null,
8+
calculateWinner: false,
9+
excludedCopy: null,
10+
sections: [
11+
{
12+
colour: { name: '--eu-parliament-theleft' },
13+
name: 'Left',
14+
value: 40,
15+
align: 'left',
16+
exclude: false,
17+
},
18+
{
19+
name: 'S&D',
20+
colour: { name: '--eu-parliament-sd' },
21+
value: 100,
22+
align: 'left',
23+
exclude: false,
24+
},
25+
{
26+
name: 'Grn/EFA',
27+
colour: { name: '--eu-parliament-greensefa' },
28+
value: 40,
29+
align: 'left',
30+
exclude: false,
31+
},
32+
{
33+
name: 'Renew',
34+
colour: { name: '--eu-parliament-renew' },
35+
value: 60,
36+
align: 'left',
37+
exclude: false,
38+
},
39+
{
40+
name: 'EPP',
41+
colour: { name: '--eu-parliament-epp' },
42+
value: 150,
43+
align: 'left',
44+
exclude: false,
45+
},
46+
{
47+
name: 'ECR',
48+
colour: { name: '--eu-parliament-ecr' },
49+
value: 60,
50+
align: 'left',
51+
exclude: false,
52+
},
53+
{
54+
name: 'NI',
55+
colour: { name: '--eu-parliament-ni' },
56+
value: 30,
57+
align: 'left',
58+
exclude: false,
59+
},
60+
{
61+
name: 'PfE',
62+
colour: { name: '--eu-parliament-unknown' },
63+
value: 70,
64+
align: 'left',
65+
exclude: false,
66+
},
67+
{
68+
name: 'ESN',
69+
colour: { name: '--eu-parliament-unknown' },
70+
value: 20,
71+
align: 'left',
72+
exclude: false,
73+
},
74+
],
75+
},
76+
},
77+
{
78+
kind: 'valuesWithChange',
79+
props: {
80+
valueDescription: 'Seats',
81+
changeDescription: 'Change in seats',
82+
values: [
83+
{
84+
name: 'Left',
85+
value: 46,
86+
change: 9,
87+
colour: { name: '--eu-parliament-theleft' },
88+
},
89+
{
90+
name: 'S&D',
91+
value: 100,
92+
change: -3,
93+
colour: { name: '--eu-parliament-sd' },
94+
},
95+
{
96+
name: 'Grn/EFA',
97+
value: 40,
98+
change: -19,
99+
colour: { name: '--eu-parliament-greensefa' },
100+
},
101+
{
102+
name: 'Renew',
103+
value: 60,
104+
change: -25,
105+
colour: { name: '--eu-parliament-renew' },
106+
},
107+
{
108+
name: 'EPP',
109+
value: 150,
110+
change: 12,
111+
colour: { name: '--eu-parliament-epp' },
112+
},
113+
{
114+
name: 'ECR',
115+
value: 60,
116+
change: 9,
117+
colour: { name: '--eu-parliament-ecr' },
118+
},
119+
{
120+
name: 'NI',
121+
value: 30,
122+
change: 0,
123+
colour: { name: '--eu-parliament-ni' },
124+
},
125+
{
126+
name: 'PfE',
127+
value: 70,
128+
change: 0,
129+
colour: { name: '--eu-parliament-unknown' },
130+
},
131+
{
132+
name: 'ESN',
133+
value: 20,
134+
change: 0,
135+
colour: { name: '--eu-parliament-unknown' },
136+
},
137+
],
138+
},
139+
},
140+
{
141+
kind: 'onwardLink',
142+
props: {
143+
text: 'See full results',
144+
link: 'https://www.theguardian.com',
145+
},
146+
},
147+
],
148+
};

‎dotcom-rendering/fixtures/manual/electionTrackers/ukGeneralExitPoll.ts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
export const ukGeneralExitPoll = {
2+
components: [
3+
{
4+
kind: 'versus',
5+
props: {
6+
left: {
7+
name: 'Labour',
8+
abbreviation: 'Lab',
9+
image: {
10+
url: 'https://uploads.guim.co.uk/2024/06/24/Starmer.png',
11+
alt: 'Watercolour portrait of Sir Keir Starmer',
12+
},
13+
colour: { name: '--uk-elections-labour' },
14+
value: 0,
15+
description: 'seats declared',
16+
},
17+
right: {
18+
name: 'Conservatives',
19+
abbreviation: 'Con',
20+
image: {
21+
url: 'https://uploads.guim.co.uk/2024/06/24/Sunak.png',
22+
alt: 'Watercolour portrait of Rishi Sunak',
23+
},
24+
colour: { name: '--uk-elections-conservative' },
25+
value: 0,
26+
description: 'seats declared',
27+
},
28+
colour: 'name',
29+
faded: true,
30+
banner: 'Exit poll',
31+
},
32+
},
33+
{
34+
kind: 'onwardLink',
35+
props: {
36+
text: 'View results page',
37+
link: 'https://www.theguardian.com',
38+
},
39+
},
40+
],
41+
};

‎dotcom-rendering/fixtures/manual/electionTrackers/ukGeneralFinal.ts‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
export const ukGeneralFinal = {
2+
components: [
3+
{
4+
kind: 'versus',
5+
props: {
6+
left: {
7+
name: 'Labour',
8+
abbreviation: 'Lab',
9+
value: 412,
10+
change: 214,
11+
image: {
12+
url: 'https://uploads.guim.co.uk/2024/06/24/Starmer.png',
13+
alt: 'Watercolour portrait of Sir Keir Starmer',
14+
},
15+
colour: { name: '--uk-elections-labour' },
16+
},
17+
right: {
18+
name: 'Conservatives',
19+
abbreviation: 'Con',
20+
value: 121,
21+
change: -252,
22+
image: {
23+
url: 'https://uploads.guim.co.uk/2024/06/24/Sunak.png',
24+
alt: 'Watercolour portrait of Rishi Sunak',
25+
},
26+
colour: { name: '--uk-elections-conservative' },
27+
},
28+
colour: 'name',
29+
faded: false,
30+
banner: null,
31+
},
32+
},
33+
{
34+
kind: 'stackedProgress',
35+
props: {
36+
total: 650,
37+
label: 'for majority',
38+
calculateWinner: true,
39+
excludedCopy: null,
40+
sections: [
41+
{
42+
name: 'Labour',
43+
colour: { name: '--uk-elections-labour' },
44+
value: 400,
45+
align: 'left',
46+
exclude: false,
47+
},
48+
{
49+
name: 'Conservative',
50+
colour: { name: '--uk-elections-conservative' },
51+
value: 100,
52+
align: 'right',
53+
exclude: false,
54+
},
55+
{
56+
name: 'Lib Dem',
57+
colour: { name: '--uk-elections-liberal-democrat' },
58+
value: 70,
59+
align: 'left',
60+
exclude: false,
61+
},
62+
{
63+
name: 'SNP',
64+
colour: {
65+
name: '--uk-elections-scottish-national-party',
66+
},
67+
value: 10,
68+
align: 'left',
69+
exclude: false,
70+
},
71+
{
72+
name: 'Reform',
73+
colour: { name: '--uk-elections-reform-uk' },
74+
value: 5,
75+
align: 'right',
76+
exclude: false,
77+
},
78+
],
79+
},
80+
},
81+
{
82+
kind: 'progressNumber',
83+
props: {
84+
progress: 650,
85+
total: 650,
86+
copy: 'seats declared',
87+
additionalCopy: null,
88+
},
89+
},
90+
{
91+
kind: 'onwardLink',
92+
props: {
93+
text: 'See full results',
94+
link: 'https://www.theguardian.com',
95+
},
96+
},
97+
],
98+
};

‎dotcom-rendering/fixtures/manual/electionTrackers/ukLocal.ts‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
export const ukLocal = {
2+
components: [
3+
{
4+
kind: 'changeBars',
5+
props: {
6+
changes: [
7+
{
8+
name: 'Conservative',
9+
abbreviation: 'Con',
10+
change: -635,
11+
colour: { name: '--uk-elections-conservative' },
12+
},
13+
{
14+
name: 'Labour',
15+
abbreviation: 'Lab',
16+
change: -198,
17+
colour: { name: '--uk-elections-labour' },
18+
},
19+
{
20+
name: 'Liberal Democrat',
21+
abbreviation: 'Lib Dem',
22+
change: 146,
23+
colour: { name: '--uk-elections-liberal-democrat' },
24+
},
25+
{
26+
name: 'Reform UK',
27+
abbreviation: 'Reform',
28+
change: 648,
29+
colour: { name: '--uk-elections-reform-uk' },
30+
},
31+
{
32+
name: 'Other',
33+
abbreviation: 'Other',
34+
change: -56,
35+
colour: { name: '--uk-elections-others' },
36+
},
37+
],
38+
},
39+
},
40+
{
41+
kind: 'progressNumber',
42+
props: {
43+
progress: 200,
44+
total: 200,
45+
copy: 'councils declared',
46+
additionalCopy: null,
47+
},
48+
},
49+
{
50+
kind: 'onwardLink',
51+
props: {
52+
text: 'See full results',
53+
link: 'https://www.theguardian.com',
54+
},
55+
},
56+
],
57+
};

0 commit comments

Comments
 (0)