Merge pull request #27023 from guardian/render-old-liveblogs-via-dcr

Render old liveblogs via DCR
guardian · Apr 18, 2024 · 67dd46d · 67dd46d
2 parents 5c9c924 + 5e1f071
commit 67dd46d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 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 {