Skip to content

Commit 155c448

Browse files
authored
Merge branch 'main' into gl/sc-tag-page-mockup
2 parents 56497b1 + 94786fd commit 155c448

File tree

102 files changed

+2886
-2078
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2886
-2078
lines changed

.github/workflows/cicd.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: DCR CICD
22

33
on:
44
push:
5-
paths-ignore:
6-
- 'ab-testing/**'
7-
- '!ab-testing/config/abTests.ts'
85

96
jobs:
107
container:

ab-testing/config/abTests.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,14 @@ const ABTests: ABTest[] = [
3737
description:
3838
"Tests whether we can get the users email, hash it and pass pd value to the userId array",
3939
owners: ["[email protected]"],
40-
expirationDate: `2025-12-19`,
40+
expirationDate: `2026-01-15`,
4141
type: "client",
42-
status: "ON",
42+
status: "OFF",
4343
audienceSize: 10 / 100,
4444
audienceSpace: "A",
4545
groups: ["control", "variant"],
4646
shouldForceMetricsCollection: true,
4747
},
48-
{
49-
name: "thefilter-product-element",
50-
description:
51-
"A hold back test to measure uplift of the product element",
52-
owners: ["[email protected]"],
53-
status: "ON",
54-
expirationDate: "2025-12-30",
55-
type: "server",
56-
audienceSize: 40 / 100,
57-
groups: ["control", "variant"],
58-
shouldForceMetricsCollection: false,
59-
},
6048
{
6149
name: "commercial-user-module-uid2",
6250
description:

ab-testing/config/scripts/validation/validExpiration.test.ts

Lines changed: 0 additions & 46 deletions
This file was deleted.

ab-testing/config/scripts/validation/validExpiration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ export function allExpirationsValid(tests: ABTest[]): boolean {
66
const now = new Date();
77

88
if (expires < now) {
9-
throw new Error(
9+
console.warn(
1010
`${
1111
test.name
12-
} has an expiration date in the past: ${expires.toISOString()}, has it expired? If it doesn't belong to you or your team, you can set the status to OFF for now.`,
12+
} has an expiration date in the past: ${expires.toISOString()}, has it expired?`,
1313
);
1414
}
1515
});
Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
import { type FootballTable } from '../../src/footballTables';
2+
3+
export const table: FootballTable = {
4+
entries: [
5+
{
6+
position: 1,
7+
team: {
8+
name: 'Liverpool',
9+
id: '9',
10+
url: '/football/liverpool',
11+
},
12+
gamesPlayed: 29,
13+
won: 21,
14+
drawn: 7,
15+
lost: 1,
16+
goalsFor: 69,
17+
goalsAgainst: 27,
18+
goalDifference: 42,
19+
points: 70,
20+
results: [
21+
{
22+
matchId: '1',
23+
self: { name: 'Liverpool', score: 1 },
24+
foe: { name: 'Chelsea', score: 0 },
25+
},
26+
{
27+
matchId: '2',
28+
self: { name: 'Liverpool', score: 3 },
29+
foe: { name: 'Arsenal', score: 5 },
30+
},
31+
{
32+
matchId: '3',
33+
self: { name: 'Liverpool', score: 0 },
34+
foe: { name: 'West Ham', score: 0 },
35+
},
36+
{
37+
matchId: '4',
38+
self: { name: 'Liverpool', score: 8 },
39+
foe: { name: 'Tottenham', score: 10 },
40+
},
41+
{
42+
matchId: '5',
43+
self: { name: 'Liverpool', score: 0 },
44+
foe: { name: 'Brighton', score: 0 },
45+
},
46+
],
47+
},
48+
{
49+
position: 2,
50+
team: {
51+
name: 'Arsenal',
52+
id: '1006',
53+
url: '/football/arsenal',
54+
},
55+
gamesPlayed: 29,
56+
won: 21,
57+
drawn: 10,
58+
lost: 3,
59+
goalsFor: 53,
60+
goalsAgainst: 24,
61+
goalDifference: 29,
62+
points: 58,
63+
results: [
64+
{
65+
matchId: '1',
66+
self: { name: 'Arsenal', score: 4 },
67+
foe: { name: 'Brighton', score: 0 },
68+
},
69+
{
70+
matchId: '2',
71+
self: { name: 'Arsenal', score: 3 },
72+
foe: {
73+
name: 'Manchester United',
74+
score: 0,
75+
},
76+
},
77+
{
78+
matchId: '3',
79+
self: { name: 'Arsenal', score: 5 },
80+
foe: { name: 'West Ham', score: 0 },
81+
},
82+
{
83+
matchId: '4',
84+
self: { name: 'Arsenal', score: 9 },
85+
foe: {
86+
name: 'Manchester City',
87+
score: 0,
88+
},
89+
},
90+
{
91+
matchId: '5',
92+
self: { name: 'Arsenal', score: 0 },
93+
foe: { name: 'Tottenham', score: 0 },
94+
},
95+
],
96+
},
97+
{
98+
position: 3,
99+
team: {
100+
name: 'Nottm Forest',
101+
id: '15',
102+
url: '/football/nottinghamforest',
103+
},
104+
gamesPlayed: 29,
105+
won: 16,
106+
drawn: 6,
107+
lost: 7,
108+
goalsFor: 49,
109+
goalsAgainst: 35,
110+
goalDifference: 14,
111+
points: 54,
112+
results: [
113+
{
114+
matchId: '1',
115+
self: { name: 'Nottm Forest', score: 4 },
116+
foe: { name: 'Brighton', score: 4 },
117+
},
118+
{
119+
matchId: '2',
120+
self: { name: 'Nottm Forest', score: 0 },
121+
foe: {
122+
name: 'Manchester United',
123+
score: 0,
124+
},
125+
},
126+
{
127+
matchId: '3',
128+
self: { name: 'Nottm Forest', score: 0 },
129+
foe: { name: 'West Ham', score: 7 },
130+
},
131+
{
132+
matchId: '4',
133+
self: { name: 'Nottm Forest', score: 9 },
134+
foe: {
135+
name: 'Manchester City',
136+
score: 0,
137+
},
138+
},
139+
{
140+
matchId: '5',
141+
self: { name: 'Nottm Forest', score: 10 },
142+
foe: { name: 'Tottenham', score: 0 },
143+
},
144+
],
145+
},
146+
],
147+
};

0 commit comments

Comments
 (0)