Skip to content

Commit a35d545

Browse files
authored
Merge pull request #13754 from guardian/an/fix-fixture-generation
fix the fixture generation script and regenerate
2 parents 18aa035 + 451058d commit a35d545

30 files changed

+3585
-3086
lines changed

dotcom-rendering/fixtures/generated/fe-articles/Analysis.ts

Lines changed: 79 additions & 80 deletions
Large diffs are not rendered by default.

dotcom-rendering/fixtures/generated/fe-articles/Audio.ts

Lines changed: 165 additions & 83 deletions
Large diffs are not rendered by default.

dotcom-rendering/fixtures/generated/fe-articles/Comment.ts

Lines changed: 64 additions & 65 deletions
Large diffs are not rendered by default.

dotcom-rendering/fixtures/generated/fe-articles/Dead.ts

Lines changed: 110 additions & 123 deletions
Large diffs are not rendered by default.

dotcom-rendering/fixtures/generated/fe-articles/Editorial.ts

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export const Editorial: FEArticle = {
3131
{
3232
index: 0,
3333
fields: {
34+
aspectRatio: '5:3',
3435
height: '1200',
3536
width: '2000',
3637
},
@@ -41,6 +42,7 @@ export const Editorial: FEArticle = {
4142
{
4243
index: 1,
4344
fields: {
45+
aspectRatio: '5:3',
4446
height: '600',
4547
width: '1000',
4648
},
@@ -51,6 +53,7 @@ export const Editorial: FEArticle = {
5153
{
5254
index: 2,
5355
fields: {
56+
aspectRatio: '5:3',
5457
height: '300',
5558
width: '500',
5659
},
@@ -61,6 +64,7 @@ export const Editorial: FEArticle = {
6164
{
6265
index: 3,
6366
fields: {
67+
aspectRatio: '5:3',
6468
height: '84',
6569
width: '140',
6670
},
@@ -71,6 +75,7 @@ export const Editorial: FEArticle = {
7175
{
7276
index: 4,
7377
fields: {
78+
aspectRatio: '5:3',
7479
height: '3193',
7580
width: '5322',
7681
},
@@ -81,6 +86,7 @@ export const Editorial: FEArticle = {
8186
{
8287
index: 5,
8388
fields: {
89+
aspectRatio: '5:3',
8490
isMaster: 'true',
8591
height: '3193',
8692
width: '5322',
@@ -91,7 +97,7 @@ export const Editorial: FEArticle = {
9197
},
9298
],
9399
},
94-
elementId: 'dc5f9195-8c5e-42bb-a4b5-84e15f1effaf',
100+
elementId: 'dfb472d2-1d83-4332-bb06-ebb02fab56ef',
95101
imageSources: [
96102
{
97103
weighting: 'inline',
@@ -291,32 +297,32 @@ export const Editorial: FEArticle = {
291297
{
292298
_type: 'model.dotcomrendering.pageElements.TextBlockElement',
293299
html: '<p>The greatest advances in the battle against the coronavirus have been made by modern science, but before there were vaccines, countries had to rely on older techniques: stopping people mingling; preventing new cases of the disease arriving from overseas. Britain’s record with lockdowns is not great (late to implement, premature in lifting), but with quarantine at the border there is barely even a record to defend. For much of last year there was a notional obligation on travellers from various countries to self-isolate on arrival in the UK, but with a shifting roster of places that qualified for “safe” travel corridors.</p>',
294-
elementId: '9cc19398-550d-4a73-88fa-37202daeceff',
300+
elementId: '444bb991-3779-49ed-abd5-3a2535903440',
295301
},
296302
{
297303
_type: 'model.dotcomrendering.pageElements.TextBlockElement',
298304
html: '<p>There were many categories of exemption. The regulations were unclear and poorly implemented. <a href="https://www.theguardian.com/world/commentisfree/2021/jan/28/uk-covid-travel-quarantine-hotel" title="">Efforts at enforcement have been patchy</a>. Essentially, self-isolation has been self-policed. Only towards the end of last year, as it became clear that mutant strains of the virus were spreading – and that Britain’s approach was persistently failing – did the government start focusing on <a href="https://www.theguardian.com/world/2021/jan/27/how-quarantine-rules-work-and-what-uk-government-is-planning" title="">quarantine as part of the anti-virus arsenal</a>. More travellers are now required to show proof of a negative Covid test and there are tighter restrictions on arrivals from certain “hotspot” countries. That approach is still flawed. People, and the virus they might carry, do not always travel straight from the heart of an outbreak to the UK. Mutations are dispersed along multiple paths.</p>',
299-
elementId: 'b6cdae71-9a52-409a-aad6-d909635446c3',
305+
elementId: 'a84e7e42-1755-4138-a6c9-af07f7d4b3bf',
300306
},
301307
{
302308
_type: 'model.dotcomrendering.pageElements.TextBlockElement',
303309
html: '<p>Ministers have said further border measures are required, but cannot say when they will be applied. The new regime is expected to involve diverting large numbers of arrivals to government-approved hotels for up to 10 days, with an option of getting out sooner with a negative test. The Department for Transport and the Treasury <a href="https://www.theguardian.com/world/2021/feb/03/grant-shapps-resists-blanket-border-controls-to-stem-covid-in-britain" title="">have been squeamish</a> about the cost of such a regime. Passengers would get a bill, but the whole system would still be expensive and inflict another wound on an already injured aviation sector.</p>',
304-
elementId: '003cd322-ed8f-48fb-81f1-feb0448bb3a1',
310+
elementId: '55f8f7ec-5644-4212-bc09-f790b8615bb6',
305311
},
306312
{
307313
_type: 'model.dotcomrendering.pageElements.TextBlockElement',
308314
html: '<p>But, as has been demonstrated many times in the pandemic, resisting tighter restrictions to avoid an immediate financial burden is a false economy. Delay allows the disease to spread. The onerous measures are still required and have to be in place for longer. That remains true even as the vaccination programme is rolled out. Not enough is yet known about vaccine resilience in the face of recently discovered coronavirus variants, let alone any future mutations. <a href="https://www.theguardian.com/world/2021/jan/22/covid-vaccines-what-are-the-implications-of-new-variants-of-virus" title="">The risk is not negligible.</a></p>',
309-
elementId: '40ae80e7-3d11-476f-a534-48e9ffd1dac3',
315+
elementId: '5b1e1f08-3bf9-4a54-b556-9e5330c5abe0',
310316
},
311317
{
312318
_type: 'model.dotcomrendering.pageElements.TextBlockElement',
313319
html: '<p>Countries with the strongest records against disease have applied the full range of containment measures quickly and thoroughly, including efficient testing, contact tracing, and a presumption that all new arrivals face quarantine (with some flexibility for humanitarian exceptions, naturally). That principle should be the basis for the UK’s regime. A speedy vaccination roll-out has given Boris Johnson <a href="https://www.theguardian.com/society/2021/jan/31/daily-record-as-600000-people-in-the-uk-receive-covid-jabs-on-saturday" title="">cause to celebrate</a> his government’s accomplishments relative to other countries. Ministerial relief at having something to cheer is palpable, but it must not lead to neglect of other fronts in the battle or feed the culture of impatience and denial that causes many Conservative MPs to demand unwarranted easing of restrictions.</p>',
314-
elementId: 'd1e86b49-d0af-403d-a8b6-c0679418a102',
320+
elementId: 'd105bed6-3e2b-4291-9fc6-da6eaf118bfc',
315321
},
316322
{
317323
_type: 'model.dotcomrendering.pageElements.TextBlockElement',
318324
html: '<p>No one should belittle the social, economic and psychological cost of anti-Covid restrictions. Quarantine, like lockdown, is a harsh instrument to be used only as an emergency resort. But we are now a year into such an emergency. The government’s haphazard approach, justified by a pursuit of short-term economic relief, has only prolonged the ordeal. The vaccine programme illuminates a way out. It would be a tragic squandering of that success if overreliance on new technology were to breed complacency regarding older but no less vital methods of protecting the public.</p>',
319-
elementId: '6e00bce4-a833-4156-aa30-31ec14069b5a',
325+
elementId: '7b5faf0c-a2ef-4edf-accb-1a81954208a1',
320326
},
321327
],
322328
attributes: {
@@ -659,7 +665,6 @@ export const Editorial: FEArticle = {
659665
brazeSwitch: true,
660666
consentManagement: true,
661667
commercial: true,
662-
redplanetForAus: true,
663668
prebidSonobi: true,
664669
idProfileNavigation: true,
665670
confiantAdVerification: true,
@@ -1123,6 +1128,10 @@ export const Editorial: FEArticle = {
11231128
},
11241129
],
11251130
},
1131+
{
1132+
title: 'US politics',
1133+
url: '/us-news/us-politics',
1134+
},
11261135
{
11271136
title: 'World',
11281137
url: '/world',
@@ -1172,6 +1181,10 @@ export const Editorial: FEArticle = {
11721181
title: 'Climate crisis',
11731182
url: '/environment/climate-crisis',
11741183
},
1184+
{
1185+
title: 'Middle East',
1186+
url: '/world/middleeast',
1187+
},
11751188
{
11761189
title: 'Ukraine',
11771190
url: '/world/ukraine',
@@ -1298,32 +1311,6 @@ export const Editorial: FEArticle = {
12981311
title: 'UK politics',
12991312
url: '/politics',
13001313
},
1301-
{
1302-
title: 'Education',
1303-
url: '/education',
1304-
children: [
1305-
{
1306-
title: 'Schools',
1307-
url: '/education/schools',
1308-
},
1309-
{
1310-
title: 'Teachers',
1311-
url: '/teacher-network',
1312-
},
1313-
{
1314-
title: 'Universities',
1315-
url: '/education/universities',
1316-
},
1317-
{
1318-
title: 'Students',
1319-
url: '/education/students',
1320-
},
1321-
],
1322-
},
1323-
{
1324-
title: 'Society',
1325-
url: '/society',
1326-
},
13271314
{
13281315
title: 'Science',
13291316
url: '/science',
@@ -1500,6 +1487,10 @@ export const Editorial: FEArticle = {
15001487
longTitle: 'Lifestyle home',
15011488
iconName: 'home',
15021489
children: [
1490+
{
1491+
title: 'The Filter',
1492+
url: '/uk/thefilter',
1493+
},
15031494
{
15041495
title: 'Fashion',
15051496
url: '/fashion',
@@ -1632,7 +1623,7 @@ export const Editorial: FEArticle = {
16321623
},
16331624
{
16341625
title: 'Inside the Guardian',
1635-
url: 'https://www.theguardian.com/membership',
1626+
url: 'https://www.theguardian.com/insidetheguardian',
16361627
},
16371628
{
16381629
title: 'The Observer',
@@ -1673,37 +1664,45 @@ export const Editorial: FEArticle = {
16731664
url: '/crosswords/series/quick',
16741665
},
16751666
{
1676-
title: 'Cryptic',
1677-
url: '/crosswords/series/cryptic',
1667+
title: 'Speedy',
1668+
url: '/crosswords/series/speedy',
16781669
},
16791670
{
1680-
title: 'Prize',
1681-
url: '/crosswords/series/prize',
1671+
title: 'Quick cryptic',
1672+
url: '/crosswords/series/quick-cryptic',
16821673
},
16831674
{
1684-
title: 'Weekend',
1685-
url: '/crosswords/series/weekend-crossword',
1675+
title: 'Everyman',
1676+
url: '/crosswords/series/everyman',
16861677
},
16871678
{
16881679
title: 'Quiptic',
16891680
url: '/crosswords/series/quiptic',
16901681
},
16911682
{
1692-
title: 'Genius',
1693-
url: '/crosswords/series/genius',
1694-
},
1695-
{
1696-
title: 'Speedy',
1697-
url: '/crosswords/series/speedy',
1683+
title: 'Cryptic',
1684+
url: '/crosswords/series/cryptic',
16981685
},
16991686
{
1700-
title: 'Everyman',
1701-
url: '/crosswords/series/everyman',
1687+
title: 'Prize',
1688+
url: '/crosswords/series/prize',
17021689
},
17031690
{
17041691
title: 'Azed',
17051692
url: '/crosswords/series/azed',
17061693
},
1694+
{
1695+
title: 'Genius',
1696+
url: '/crosswords/series/genius',
1697+
},
1698+
{
1699+
title: 'Weekend',
1700+
url: '/crosswords/series/weekend-crossword',
1701+
},
1702+
{
1703+
title: 'Special',
1704+
url: '/crosswords/series/special',
1705+
},
17071706
],
17081707
},
17091708
{
@@ -1844,7 +1843,7 @@ export const Editorial: FEArticle = {
18441843
},
18451844
{
18461845
text: 'Help',
1847-
url: '/help',
1846+
url: 'https://manage.theguardian.com/help-centre',
18481847
dataLinkName: 'uk : footer : tech feedback',
18491848
extraClasses: 'js-tech-feedback-report',
18501849
},
@@ -1906,10 +1905,16 @@ export const Editorial: FEArticle = {
19061905
},
19071906
{
19081907
text: 'Modern Slavery Act',
1909-
url: 'https://uploads.guim.co.uk/2023/07/25/Modern_Slavery_Statement_GMG_and_Scott_Trust_2023.docx.pdf',
1908+
url: 'https://uploads.guim.co.uk/2024/09/04/Modern_Slavery_Statement_2024_.pdf',
19101909
dataLinkName: 'uk : footer : modern slavery act statement',
19111910
extraClasses: '',
19121911
},
1912+
{
1913+
text: 'Tax strategy',
1914+
url: 'https://uploads.guim.co.uk/2024/08/27/TAX_STRATEGY_FOR_THE_YEAR_ENDED_31_MARCH_2025.pdf',
1915+
dataLinkName: 'uk : footer : tax strategy',
1916+
extraClasses: '',
1917+
},
19131918
{
19141919
text: 'Digital newspaper archive',
19151920
url: 'https://theguardian.newspapers.com',
@@ -1940,12 +1945,6 @@ export const Editorial: FEArticle = {
19401945
dataLinkName: 'uk : footer : linkedin',
19411946
extraClasses: '',
19421947
},
1943-
{
1944-
text: 'Twitter',
1945-
url: 'https://twitter.com/guardian',
1946-
dataLinkName: 'uk: footer : twitter',
1947-
extraClasses: '',
1948-
},
19491948
{
19501949
text: 'Newsletters',
19511950
url: '/email-newsletters?INTCMP=DOTCOM_FOOTER_NEWSLETTER_UK',

0 commit comments

Comments
 (0)