Fix SSLSpec (#2415)

* fix test * do not fork installation of app
zio · Aug 30, 2023 · 23f04fd · 23f04fd
1 parent 6411c97
commit 23f04fd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 35 deletions.
diff --git a/zio-http/src/test/scala/zio/http/ResponseCompressionSpec.scala b/zio-http/src/test/scala/zio/http/ResponseCompressionSpec.scala
@@ -62,7 +62,7 @@ object ResponseCompressionSpec extends ZIOHttpSpec {
         for {
           server       <- ZIO.service[Server]
           client       <- ZIO.service[Client]
-          _            <- server.install(app).fork
+          _            <- server.install(app)
           response     <- client.request(
             Request(
               method = Method.GET,
@@ -78,7 +78,7 @@ object ResponseCompressionSpec extends ZIOHttpSpec {
         for {
           server       <- ZIO.service[Server]
           client       <- ZIO.service[Client]
-          _            <- server.install(app).fork
+          _            <- server.install(app)
           response     <- client.request(
             Request(
               method = Method.GET,

diff --git a/zio-http/src/test/scala/zio/http/SSLSpec.scala b/zio-http/src/test/scala/zio/http/SSLSpec.scala
@@ -36,27 +36,22 @@ object SSLSpec extends ZIOHttpSpec {
 
   val app: HttpApp[Any] = Routes(
     Method.GET / "success" -> handler(Response.ok),
-    Method.POST / "text"   -> handler { (req: Request) =>
-      for {
-        body <- req.body.asString
-      } yield Response.text(body)
-    },
   ).sandbox.toHttpApp
 
-  val successUrl =
-    URL.decode("https://localhost:8073/success").toOption.get
+  val httpUrl =
+    URL.decode("http://localhost:8073/success").toOption.get
 
-  val textUrl =
-    URL.decode("https://localhost:8073/text").toOption.get
+  val httpsUrl =
+    URL.decode("https://localhost:8073/success").toOption.get
 
   override def spec = suite("SSL")(
     Server
-      .serve(app)
+      .install(app)
       .as(
         List(
           test("succeed when client has the server certificate") {
             val actual = Client
-              .request(Request.get(successUrl))
+              .request(Request.get(httpsUrl))
               .map(_.status)
             assertZIO(actual)(equalTo(Status.Ok))
           }.provide(
@@ -69,7 +64,7 @@ object SSLSpec extends ZIOHttpSpec {
           ),
           test("fail with DecoderException when client doesn't have the server certificate") {
             val actual = Client
-              .request(Request.get(successUrl))
+              .request(Request.get(httpsUrl))
               .catchSome {
                 case e if e.getClass.getSimpleName == "DecoderException" =>
                   ZIO.succeed("DecoderException")
@@ -85,7 +80,7 @@ object SSLSpec extends ZIOHttpSpec {
           ),
           test("succeed when client has default SSL") {
             val actual = Client
-              .request(Request.get(successUrl))
+              .request(Request.get(httpsUrl))
               .map(_.status)
             assertZIO(actual)(equalTo(Status.Ok))
           }.provide(
@@ -98,7 +93,7 @@ object SSLSpec extends ZIOHttpSpec {
           ),
           test("Https Redirect when client makes http request") {
             val actual = Client
-              .request(Request.get(successUrl))
+              .request(Request.get(httpUrl))
               .map(_.status)
             assertZIO(actual)(equalTo(Status.PermanentRedirect))
           }.provide(
@@ -109,27 +104,11 @@ object SSLSpec extends ZIOHttpSpec {
             ZLayer.succeed(NettyConfig.default),
             Scope.default,
           ),
-          test("Https request with a large payload should respond with 413") {
-            check(payload) { payload =>
-              val actual = Client
-                .request(
-                  Request.post(textUrl, Body.fromString(payload)),
-                )
-                .map(_.status)
-              assertZIO(actual)(equalTo(Status.RequestEntityTooLarge))
-            }
-          }.provide(
-            Client.customized,
-            ZLayer.succeed(ZClient.Config.default.ssl(clientSSL1)),
-            NettyClientDriver.live,
-            DnsResolver.default,
-            ZLayer.succeed(NettyConfig.default),
-            Scope.default,
-          ),
         ),
       ),
   ).provideShared(
-    Server.default,
-  ) @@ ignore
+    Server.live,
+    ZLayer.succeed(config),
+  )
 
 }