Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Scope usage in ServerSentEventEndpointSpec #3182

Merged
merged 2 commits into from
Sep 29, 2024
Merged

Fix Scope usage in ServerSentEventEndpointSpec #3182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f2598e
Fix `Scope` usage in `ServerSentEventEndpointSpec`
kyri-petrou Sep 28, 2024
38a81cb
Merge branch 'main' into fix-invalid-sse-endpoint-test
987Nabil Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions zio-http/jvm/src/test/scala/zio/http/endpoint/ServerSentEventEndpointSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import zio.schema.{DeriveSchema, Schema}

import zio.http._
import zio.http.codec.HttpCodec
import zio.http.netty.NettyConfig

object ServerSentEventEndpointSpec extends ZIOHttpSpec {

Expand All @@ -40,13 +41,14 @@ object ServerSentEventEndpointSpec extends ZIOHttpSpec {
: Invocation[Unit, Unit, ZNothing, ZStream[Any, Nothing, ServerSentEvent[String]], AuthType.None] =
sseEndpoint(())

def client(port: Int): ZIO[Scope, Throwable, Chunk[ServerSentEvent[String]]] =
(for {
def client(port: Int): ZIO[Client, Throwable, Chunk[ServerSentEvent[String]]] = ZIO.scoped {
for {
client <- ZIO.service[Client]
executor = EndpointExecutor(client, locator(port))
stream <- executor(invocation)
events <- stream.take(5).runCollect
} yield events).provideSome[Scope](ZClient.default)
} yield events
}
}

object JsonPayload {
Expand Down Expand Up @@ -77,13 +79,14 @@ object ServerSentEventEndpointSpec extends ZIOHttpSpec {
: Invocation[Unit, Unit, ZNothing, ZStream[Any, Nothing, ServerSentEvent[Payload]], AuthType.None] =
sseEndpoint(())

def client(port: Int): ZIO[Scope, Throwable, Chunk[ServerSentEvent[Payload]]] =
(for {
def client(port: Int): ZIO[Client, Throwable, Chunk[ServerSentEvent[Payload]]] = ZIO.scoped {
for {
client <- ZIO.service[Client]
executor = EndpointExecutor(client, locator(port))
stream <- executor(invocation)
events <- stream.take(5).runCollect
} yield events).provideSome[Scope](ZClient.default)
} yield events
}
}

override def spec: Spec[TestEnvironment with Scope, Any] =
Expand All @@ -95,14 +98,22 @@ object ServerSentEventEndpointSpec extends ZIOHttpSpec {
port <- ZIO.serviceWithZIO[Server](_.port)
events <- client(port)
} yield assertTrue(events.size == 5 && events.forall(event => Try(ISO_LOCAL_TIME.parse(event.data)).isSuccess))
}.provideSome[Scope](Server.defaultWithPort(0)),
},
test("Send and receive ServerSentEvent with json payload") {
import JsonPayload._
for {
_ <- server.fork
port <- ZIO.serviceWithZIO[Server](_.port)
events <- client(port)
} yield assertTrue(events.size == 5 && events.forall(event => Try(event.data.timeStamp).isSuccess))
}.provideSome[Scope](Server.defaultWithPort(0)),
) @@ TestAspect.withLiveClock
},
)
.provideSomeLayer[Client & Server.Config & NettyConfig](Server.customized)
.provideShared(
Client.live,
ZLayer.succeed(Server.Config.default.port(0)),
ZLayer.succeed(NettyConfig.defaultWithFastShutdown),
ZLayer.succeed(ZClient.Config.default),
DnsResolver.default,
) @@ TestAspect.withLiveClock
}
Loading