fmt

varshith257 · Sep 27, 2024 · fbd7ab8 · fbd7ab8
1 parent fd71331
commit fbd7ab8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/zio-http/jvm/src/test/scala/zio/http/StaticServerSpec.scala b/zio-http/jvm/src/test/scala/zio/http/StaticServerSpec.scala
@@ -88,7 +88,7 @@ object StaticServerSpec extends RoutesRunnableSpec {
       }
     },
     test("404 response ") {
-      checkAll(methodGenWithoutHEAD) { method =>
+      { method =>
         val actual = status(method, Path.root / "A")
         assertZIO(actual)(equalTo(Status.NotFound))
       }

diff --git a/zio-http/shared/src/main/scala/zio/http/Routes.scala b/zio-http/shared/src/main/scala/zio/http/Routes.scala
@@ -252,13 +252,10 @@ final case class Routes[-Env, +Err](routes: Chunk[zio.http.Route[Env, Err]]) { s
         val allowedMethods = tree.getAllMethods(req.path)
         chunk.length match {
           case 0 =>
-            if (allowedMethods.isEmpty) {
-              // Case 1: Path doesn't exist at all -> 404 Not Found
-              Handler.notFound
+            if (!allowedMethods.contains(req.method) && allowedMethods.nonEmpty) {
+              Handler.status(Status.MethodNotAllowed)
             } else if (!Method.knownMethods.contains(req.method)) {
               Handler.status(Status.NotImplemented)
-            } else if (!allowedMethods.contains(req.method) && allowedMethods.nonEmpty) {
-              Handler.status(Status.MethodNotAllowed)
             } else { Handler.notFound }
           case 1 => chunk(0)
           case n => // TODO: Support precomputed fallback among all chunk elements