fixed bug , plus tests and formatting applied

disneystreaming · Mar 11, 2022 · 1de97d1 · 1de97d1
1 parent c8168d0
commit 1de97d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/modules/http4s-swagger/src-jvm/smithy4s/http4s/swagger/Docs.scala b/modules/http4s-swagger/src-jvm/smithy4s/http4s/swagger/Docs.scala
@@ -36,13 +36,14 @@ private[smithy4s] abstract class Docs[F[_]](
   val jsonSpec = hasId.id.namespace + '.' + hasId.id.name + ".json"
 
   val actualPath: Path = Uri.Path.unsafeFromString("/" + path)
+
   object DocPath {
     def unapply(p: Path): Boolean = {
       p match {
-        case `actualPath` => true
-        case `actualPath` / "" => true
+        case `actualPath`                                               => true
+        case `actualPath` / ""                                          => true
         case `actualPath` / file if file.equalsIgnoreCase("index.html") => true
-        case _ => false
+        case _                                                          => false
       }
     }
   }
@@ -51,6 +52,7 @@ private[smithy4s] abstract class Docs[F[_]](
       PermanentRedirect(
         Location(Uri.unsafeFromString(s"/$path/index.html?url=/$jsonSpec"))
       )
+
     case request @ GET -> `actualPath` / filePath =>
       val resource = s"$swaggerUiPath/$filePath"
       staticResource(resource, Some(request)).getOrElseF(NotFound())
@@ -61,7 +63,6 @@ private[smithy4s] abstract class Docs[F[_]](
   }
 }
 
-
 object Docs extends Compat.DocsCompanion {}
 
 trait SwaggerUiInit {

diff --git a/modules/http4s-swagger/test/src/smithy4s/http4s/swagger/DocsSpec.scala b/modules/http4s-swagger/test/src/smithy4s/http4s/swagger/DocsSpec.scala
@@ -29,7 +29,10 @@ object DocsSpec extends SimpleIOSuite with TestCompat {
 
     test(s"GET /$path redirects to expected location") {
       val request =
-        Request[IO](method = Method.GET, uri = Uri.unsafeFromString(s"/$path"))
+        Request[IO](
+          method = Method.GET,
+          uri = Uri.unsafeFromString(s"/$path/index.html")
+        )
       app.run(request).map { response =>
         val redirectUri = response.headers
           .get(CIString("Location"))