Merge branch 'main' into ab/enhance-timeline

guardian · Apr 18, 2024 · 0acc43f · 0acc43f
2 parents bd67237 + 67dd46d
commit 0acc43f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/article/app/services/dotcomrendering/ArticlePicker.scala b/article/app/services/dotcomrendering/ArticlePicker.scala
@@ -18,8 +18,6 @@ object ArticlePageChecks {
 
   def isNotAGallery(page: PageWithStoryPackage): Boolean = !page.item.tags.isGallery
 
-  def isNotLiveBlog(page: PageWithStoryPackage): Boolean = !page.item.tags.isLiveBlog
-
   def isNotPaidContent(page: PageWithStoryPackage): Boolean = !page.item.tags.isPaidContent
 }
 
@@ -29,7 +27,6 @@ object ArticlePicker {
     Map(
       ("isSupportedType", ArticlePageChecks.isSupportedType(page)),
       ("isNotAGallery", ArticlePageChecks.isNotAGallery(page)),
-      ("isNotLiveBlog", ArticlePageChecks.isNotLiveBlog(page)),
     )
   }
 
@@ -39,7 +36,6 @@ object ArticlePicker {
       Set(
         "isSupportedType",
         "isNotAGallery",
-        "isNotLiveBlog",
       ),
     )
 

diff --git a/article/test/ArticleControllerTest.scala b/article/test/ArticleControllerTest.scala
@@ -44,10 +44,13 @@ import services.newsletters.{NewsletterApi, NewsletterSignupAgent}
   }
 
   it should "count in body links" in {
-    val result = articleController.renderArticle(liveBlogUrl)(TestRequest(liveBlogUrl))
-    val body = contentAsString(result)
-    body should include(""""inBodyInternalLinkCount":38""")
-    body should include(""""inBodyExternalLinkCount":42""")
+    val fakeRequest = FakeRequest("GET", s"$liveBlogUrl.json?dcr")
+      .withHeaders("Origin" -> "http://www.theorigin.com")
+
+    val result = articleController.renderArticle(liveBlogUrl)(fakeRequest)
+    val content = contentAsString(result)
+    content should include(""""inBodyInternalLinkCount":38""")
+    content should include(""""inBodyExternalLinkCount":42""")
   }
 
   it should "not cache 404s" in {

diff --git a/common/app/conf/AudioFlagship.scala b/common/app/conf/AudioFlagship.scala
@@ -5,7 +5,7 @@ object AudioFlagship {
   val title: String = "Today in Focus"
   val seriesId: String = "today-in-focus"
   val description: String =
-    "Listen to the story behind the headlines for a deeper understanding of the news. <strong>Every weekday with Nosheen Iqbal and Michael Safi</strong>."
+    "Listen to the story behind the headlines for a deeper understanding of the news. <strong>Every weekday with Michael Safi and Helen Pidd</strong>."
   val subscribeLinks: Map[String, String] = Map(
     "Apple Podcasts" -> "https://itunes.apple.com/gb/podcast/today-in-focus/id1440133626?mt=2",
     "Google Podcasts" -> "https://www.google.com/podcasts?feed=aHR0cHM6Ly93d3cudGhlZ3VhcmRpYW4uY29tL25ld3Mvc2VyaWVzL3RvZGF5aW5mb2N1cy9wb2RjYXN0LnhtbA%3D%3D",

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
 		"@emotion/styled": "^10.0.27",
 		"@guardian/ab-core": "^5.0.0",
 		"@guardian/automat-modules": "^0.3.8",
-		"@guardian/commercial": "17.11.0",
+		"@guardian/commercial": "^17.12.0",
 		"@guardian/core-web-vitals": "^5.0.0",
 		"@guardian/identity-auth": "2.1.0",
 		"@guardian/identity-auth-frontend": "4.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -3137,9 +3137,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@guardian/commercial@npm:17.11.0":
-  version: 17.11.0
-  resolution: "@guardian/commercial@npm:17.11.0"
+"@guardian/commercial@npm:^17.12.0":
+  version: 17.12.0
+  resolution: "@guardian/commercial@npm:17.12.0"
   dependencies:
     "@changesets/cli": "npm:^2.26.2"
     "@guardian/ophan-tracker-js": "npm:2.0.4"
@@ -3160,7 +3160,7 @@ __metadata:
     "@guardian/libs": ^16.1.0
     "@guardian/source-foundations": ^14.1.2
     "@guardian/support-dotcom-components": ^1.0.7
-  checksum: 10c0/390a6dadf9241f171424ef968de4d09de7652dc6eb809916489529dd3fe3840ed6b8de9cb1b5de73003a267f3adc7860c18ff314d6d74bf7b9873856759e172e
+  checksum: 10c0/636e9d416212356870c45a611219a3fba06260d46e0a9418348b68c4db8c87aa1a03934ab38fd76a18848d83e37b76d03940b0917984ba853a7328fd040acd64
   languageName: node
   linkType: hard
 
@@ -3229,7 +3229,7 @@ __metadata:
     "@emotion/styled": "npm:^10.0.27"
     "@guardian/ab-core": "npm:^5.0.0"
     "@guardian/automat-modules": "npm:^0.3.8"
-    "@guardian/commercial": "npm:17.11.0"
+    "@guardian/commercial": "npm:^17.12.0"
     "@guardian/core-web-vitals": "npm:^5.0.0"
     "@guardian/eslint-config-typescript": "npm:^0.7.0"
     "@guardian/identity-auth": "npm:2.1.0"