Rename http4sMUnitFunFixture to http4sMUnitClientFixture

alejandrohdezma · Apr 25, 2023 · 5065755 · 5065755
1 parent 9b00f07
commit 5065755
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/modules/http4s-munit/src/main/scala/munit/Http4sAuthedRoutesSuite.scala b/modules/http4s-munit/src/main/scala/munit/Http4sAuthedRoutesSuite.scala
@@ -100,7 +100,7 @@ abstract class Http4sAuthedRoutesSuite[A: Show] extends Http4sSuite {
   }
 
   /** @inheritdoc */
-  override def http4sMUnitFunFixture: SyncIO[FunFixture[Client[IO]]] = ResourceFixture(
+  override def http4sMUnitClientFixture: SyncIO[FunFixture[Client[IO]]] = ResourceFixture(
     Resource.pure(Client[IO](request => routes.orNotFound.run(AuthedRequest(request.getContext, request)).toResource))
   )
 

diff --git a/modules/http4s-munit/src/main/scala/munit/Http4sHttpRoutesSuite.scala b/modules/http4s-munit/src/main/scala/munit/Http4sHttpRoutesSuite.scala
@@ -82,7 +82,7 @@ trait Http4sHttpRoutesSuite extends Http4sSuite {
   }
 
   /** @inheritdoc */
-  override def http4sMUnitFunFixture: SyncIO[FunFixture[Client[IO]]] =
+  override def http4sMUnitClientFixture: SyncIO[FunFixture[Client[IO]]] =
     ResourceFixture(Resource.pure(Client[IO](request => routes.orNotFound.run(request).toResource)))
 
 }
diff --git a/modules/http4s-munit/src/main/scala/munit/Http4sSuite.scala b/modules/http4s-munit/src/main/scala/munit/Http4sSuite.scala
@@ -107,7 +107,7 @@ trait Http4sSuite extends CatsEffectSuite with Http4sDsl[IO] with Http4sClientDs
     clues(response.headers.show, response.status.show)
 
   /** Fixture to run a request against this suite */
-  def http4sMUnitFunFixture: SyncIO[FunFixture[Client[IO]]]
+  def http4sMUnitClientFixture: SyncIO[FunFixture[Client[IO]]]
 
   implicit class ResponseCluesOps(private val response: Response[IO]) {
 
@@ -306,6 +306,6 @@ trait Http4sSuite extends CatsEffectSuite with Http4sDsl[IO] with Http4sClientDs
     * }
     *   }}}
     */
-  def test(request: Request[IO]): Http4sMUnitTestCreator = Http4sMUnitTestCreator(request, http4sMUnitFunFixture)
+  def test(request: Request[IO]): Http4sMUnitTestCreator = Http4sMUnitTestCreator(request, http4sMUnitClientFixture)
 
 }
diff --git a/modules/http4s-munit/src/main/scala/munit/HttpSuite.scala b/modules/http4s-munit/src/main/scala/munit/HttpSuite.scala
@@ -97,12 +97,11 @@ trait HttpSuite extends Http4sSuite with CatsEffectFunFixtures {
 
   /** @inheritdoc */
   @SuppressWarnings(Array("scalafix:DisableSyntax.=="))
-  override def http4sMUnitFunFixture: SyncIO[FunFixture[Client[IO]]] =
-    ResourceFixture {
-      http4sMUnitClient.map { client =>
-        if (baseUri() == Uri()) client
-        else Client(request => client.run(request.withUri(baseUri().resolve(request.uri))))
-      }
+  override def http4sMUnitClientFixture: SyncIO[FunFixture[Client[IO]]] = ResourceFixture {
+    http4sMUnitClient.map { client =>
+      if (baseUri() == Uri()) client
+      else Client(request => client.run(request.withUri(baseUri().resolve(request.uri))))
     }
+  }
 
 }
diff --git a/modules/http4s-munit/src/test/scala/munit/CiStringHeaderOpsSuite.scala b/modules/http4s-munit/src/test/scala/munit/CiStringHeaderOpsSuite.scala
@@ -25,7 +25,7 @@ import org.typelevel.ci._
 
 class HeaderInterpolatorSuite extends Http4sSuite {
 
-  override def http4sMUnitFunFixture: SyncIO[FunFixture[Client[IO]]] =
+  override def http4sMUnitClientFixture: SyncIO[FunFixture[Client[IO]]] =
     fail("This should not be called")
 
   test("header interpolator creates a valid raw header") {