test: make them pass

guardian · Jun 13, 2024 · 51d2ac3 · 51d2ac3
1 parent f9d3e78
commit 51d2ac3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/sport/app/football/controllers/FixturesController.scala b/sport/app/football/controllers/FixturesController.scala
@@ -97,7 +97,7 @@ class FixturesController(
                 contentApiClient
                   .getResponse(contentApiClient.item(id, edition))
                   .map(_.interactive.map(InteractiveAtom.make(_)))
-                  .recover{ case _ => None}
+                  .recover { case _ => None }
                   .map(renderMatchList(page, fixtures, filters, _))
               case _ =>
                 Future.successful(renderMatchList(page, fixtures, filters, None))

diff --git a/sport/app/football/controllers/MatchDayController.scala b/sport/app/football/controllers/MatchDayController.scala
@@ -62,7 +62,7 @@ class MatchDayController(
             contentApiClient
               .getResponse(contentApiClient.item(id, edition))
               .map(_.interactive.map(InteractiveAtom.make(_)))
-              .recover{ case _ => None}
+              .recover { case _ => None }
               .map(renderMatchList(page, matches, filters, _))
           } else Future.successful(renderMatchList(page, matches, filters, None))
         }

diff --git a/sport/app/football/controllers/MatchListController.scala b/sport/app/football/controllers/MatchListController.scala
@@ -34,7 +34,7 @@ trait MatchListController extends BaseController with Requests {
           "html" -> football.views.html.matchList.matchesComponent(matchesList),
           "next" -> Html(matchesList.nextPage.getOrElse("")),
           "previous" -> Html(matchesList.previousPage.getOrElse("")),
-          "atom" -> atom,
+          "atom" -> atom.isDefined,
         )
       else
         RevalidatableResult.Ok(football.views.html.matchList.matchesPage(page, matchesList, filters, atom))

diff --git a/sport/test/LeagueTablesFeatureTest.scala b/sport/test/LeagueTablesFeatureTest.scala
@@ -18,7 +18,8 @@ import org.scalatest.matchers.should.Matchers
     with BeforeAndAfterAll
     with WithMaterializer
     with WithTestApplicationContext
-    with WithTestWsClient {
+    with WithTestWsClient
+    with WithTestContentApiClient {
 
   Feature("League Tables") {
 
@@ -67,7 +68,7 @@ import org.scalatest.matchers.should.Matchers
 
     Scenario("Should redirect when no competition table data found") {
       val leagueTableController =
-        new LeagueTableController(testCompetitionsService, play.api.test.Helpers.stubControllerComponents())
+        new LeagueTableController(testCompetitionsService, play.api.test.Helpers.stubControllerComponents(), testContentApiClient)
       val result = leagueTableController.renderCompetition("sfgsfgsfg")(FakeRequest())
       status(result) should be(303)
     }

diff --git a/sport/test/controllers/LeagueTableControllerTest.scala b/sport/test/controllers/LeagueTableControllerTest.scala
@@ -17,10 +17,11 @@ import org.scalatest.{BeforeAndAfterAll, DoNotDiscover}
     with BeforeAndAfterAll
     with WithTestApplicationContext
     with WithTestExecutionContext
-    with WithTestWsClient {
+    with WithTestWsClient
+    with WithTestContentApiClient {
 
   lazy val leagueTableController =
-    new LeagueTableController(testCompetitionsService, play.api.test.Helpers.stubControllerComponents())
+    new LeagueTableController(testCompetitionsService, play.api.test.Helpers.stubControllerComponents(), testContentApiClient)
 
   "League Table Controller" should "200 when content type is table" in {
     val result = leagueTableController.renderLeagueTables()(TestRequest())