issue_2212 incorporate the review comments

zio · Aug 30, 2023 · 6c3bd2d · 6c3bd2d
1 parent 2ff764a
commit 6c3bd2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/zio-http/src/main/scala/zio/http/ZClient.scala b/zio-http/src/main/scala/zio/http/ZClient.scala
@@ -647,7 +647,7 @@ object ZClient {
     )(implicit trace: Trace): ZIO[Scope, Throwable, Response] = {
       val request = Request(version, method, url, headers, body, None)
       val cfg     = config.copy(ssl = sslConfig.orElse(config.ssl), proxy = proxy.orElse(config.proxy))
-      requestAsync(request, cfg, () =>  WebSocketApp.unit, None)
+      requestAsync(request, cfg, () => WebSocketApp.unit, None)
     }
 
     def socket[Env1](

diff --git a/zio-http/src/test/scala/zio/http/ClientProxySpec.scala b/zio-http/src/test/scala/zio/http/ClientProxySpec.scala
@@ -23,8 +23,8 @@ import zio.test.TestAspect.{sequential, timeout, withLiveClock}
 import zio.test._
 import zio.{Scope, Trace, ZIO, ZLayer, durationInt}
 
-import zio.http.internal.{DynamicServer, HttpRunnableSpec, serverTestLayer}
 import zio.http.ZClient.{Config, DriverLive}
+import zio.http.internal.{DynamicServer, HttpRunnableSpec, serverTestLayer}
 import zio.http.netty.NettyConfig
 import zio.http.netty.client.NettyClientDriver
 
@@ -57,7 +57,7 @@ object ClientProxySpec extends HttpRunnableSpec {
           url  <- ZIO.fromEither(URL.decode(s"http://localhost:$port"))
           id   <- DynamicServer.deploy(Handler.ok.toHttpApp)
           proxy = Proxy.empty.url(url).headers(Headers(DynamicServer.APP_ID, id))
-          zclient <- ZIO.serviceWith[Client](_.copy(proxy = Some(proxy)))
+          zclient <- ZIO.serviceWith[Client](_.proxy(proxy))
           out     <- zclient
             .request(
               Request.get(url = url),
@@ -67,7 +67,9 @@ object ClientProxySpec extends HttpRunnableSpec {
             )
         } yield out
       assertZIO(res.either)(isRight)
-    },
+    }.provideSome[DynamicServer](
+      Client.default,
+    ),
     test("proxy respond Ok") {
       val res =
         for {
@@ -87,7 +89,6 @@ object ClientProxySpec extends HttpRunnableSpec {
               ZLayer.succeed(NettyConfig.default),
               Scope.default,
             )
-          _ = println(out)
         } yield out
       assertZIO(res.either)(isRight)
     },
@@ -130,5 +131,4 @@ object ClientProxySpec extends HttpRunnableSpec {
   override def spec: Spec[TestEnvironment with Scope, Any] = suite("ClientProxy") {
     serve.as(List(clientProxySpec))
   }.provideShared(DynamicServer.live, serverTestLayer) @@ sequential @@ withLiveClock
-    timeout(5 seconds) @@ sequential @@ withLiveClock
 }