Merge remote-tracking branch 'origin/main' into jlk/commercial-bundle…

…-fetcher
guardian · Dec 3, 2024 · 0361b2e · 0361b2e
2 parents bf53fff + d26c066
commit 0361b2e
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 48 deletions.
diff --git a/common/app/conf/switches/ABTestSwitches.scala b/common/app/conf/switches/ABTestSwitches.scala
@@ -44,7 +44,7 @@ trait ABTestSwitches {
     "Test the Opt Out frequency capping feature",
     owners = Seq(Owner.withEmail("[email protected]")),
     safeState = Off,
-    sellByDate = Some(LocalDate.of(2024, 12, 2)),
+    sellByDate = Some(LocalDate.of(2025, 1, 29)),
     exposeClientSide = true,
     highImpact = false,
   )
@@ -71,16 +71,6 @@ trait ABTestSwitches {
     highImpact = false,
   )
 
-  Switch(
-    ABTests,
-    "ab-new-header-bidding-endpoint",
-    "Test new header bidding (prebid) analytics endpoint",
-    owners = Seq(Owner.withEmail("[email protected]")),
-    safeState = Off,
-    sellByDate = Some(LocalDate.of(2024, 12, 2)),
-    exposeClientSide = true,
-    highImpact = false,
-  )
   Switch(
     ABTests,
     "ab-gpid-prebid-ad-units",

diff --git a/common/app/conf/switches/FeatureSwitches.scala b/common/app/conf/switches/FeatureSwitches.scala
@@ -567,9 +567,9 @@ trait FeatureSwitches {
     group = SwitchGroup.Feature,
     name = "disable-front-container-show-hide",
     description = "For users with no currently hidden containers on a front, removes the ability to hide containers",
-    owners = Seq(Owner.withGithub("cemms1")),
+    owners = Seq(Owner.withEmail("[email protected]")),
     safeState = On,
-    sellByDate = LocalDate.of(2024, 11, 29),
+    sellByDate = LocalDate.of(2025, 2, 4),
     exposeClientSide = true,
     highImpact = false,
   )

diff --git a/common/app/navigation/NavLinks.scala b/common/app/navigation/NavLinks.scala
@@ -319,11 +319,12 @@ object NavLinks {
       usNews,
       usPolitics,
       world,
-      usEnvironment,
+      climateCrisis,
       middleEast,
       ukraine,
       usSoccer,
       usBusiness,
+      usEnvironment,
       usTech,
       science,
       newsletters,

diff --git a/common/test/resources/reference-navigation.json b/common/test/resources/reference-navigation.json
@@ -1070,40 +1070,9 @@
 					"classList": []
 				},
 				{
-					"title": "Environment",
-					"url": "/us/environment",
-					"children": [
-						{
-							"title": "Climate crisis",
-							"url": "/environment/climate-crisis",
-							"children": [],
-							"classList": []
-						},
-						{
-							"title": "Wildlife",
-							"url": "/environment/wildlife",
-							"children": [],
-							"classList": []
-						},
-						{
-							"title": "Energy",
-							"url": "/environment/energy",
-							"children": [],
-							"classList": []
-						},
-						{
-							"title": "Pollution",
-							"url": "/environment/pollution",
-							"children": [],
-							"classList": []
-						},
-						{
-							"title": "Green light",
-							"url": "/environment/series/green-light",
-							"children": [],
-							"classList": []
-						}
-					],
+					"title": "Climate crisis",
+					"url": "/environment/climate-crisis",
+					"children": [],
 					"classList": []
 				},
 				{
@@ -1198,6 +1167,43 @@
 					],
 					"classList": []
 				},
+				{
+					"title": "Environment",
+					"url": "/us/environment",
+					"children": [
+						{
+							"title": "Climate crisis",
+							"url": "/environment/climate-crisis",
+							"children": [],
+							"classList": []
+						},
+						{
+							"title": "Wildlife",
+							"url": "/environment/wildlife",
+							"children": [],
+							"classList": []
+						},
+						{
+							"title": "Energy",
+							"url": "/environment/energy",
+							"children": [],
+							"classList": []
+						},
+						{
+							"title": "Pollution",
+							"url": "/environment/pollution",
+							"children": [],
+							"classList": []
+						},
+						{
+							"title": "Green light",
+							"url": "/environment/series/green-light",
+							"children": [],
+							"classList": []
+						}
+					],
+					"classList": []
+				},
 				{
 					"title": "Tech",
 					"url": "/us/technology",