Skip to content

Commit 7b7eda3

Browse files
committed
fix for changes in upstream
1 parent 6cfd002 commit 7b7eda3

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

server/http4s-server/src/test/scala/sttp/tapir/server/http4s/Http4sServerTest.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,8 @@ class Http4sServerTest[R >: Fs2Streams[IO] with WebSockets] extends TestSuite wi
153153
// middleware to add the context to each request (so here string constant)
154154
val middleware: ContextMiddleware[IO, String] = ContextMiddleware.const(expectedContext)
155155

156-
BlazeServerBuilder[IO]
157-
.withExecutionContext(ExecutionContext.global)
158-
.bindHttp(0, "localhost")
159-
.withHttpWebSocketApp(wsb => middleware(routesWithContext(wsb)).orNotFound)
160-
.resource
156+
interpreter
157+
.buildServer(wsb => middleware(routesWithContext(wsb)).orNotFound)
161158
.use { server =>
162159
val port = server.address.getPort
163160
basicRequest

server/http4s-server/src/test/scala/sttp/tapir/server/http4s/Http4sTestServerInterpreter.scala

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import cats.effect.{IO, Resource}
55
import cats.syntax.all._
66
import com.comcast.ip4s
77
import org.http4s.ember.server.EmberServerBuilder
8+
import org.http4s.server.Server
89
import org.http4s.server.websocket.WebSocketBuilder2
910
import org.http4s.{HttpApp, HttpRoutes}
1011
import sttp.capabilities.WebSockets
@@ -30,19 +31,21 @@ class Http4sTestServerInterpreter extends TestServerInterpreter[IO, Fs2Streams[I
3031
private val anyAvailablePort = ip4s.Port.fromInt(0).get
3132
private val serverBuilder = EmberServerBuilder.default[IO].withPort(anyAvailablePort)
3233

33-
override def server(
34-
routes: NonEmptyList[Routes],
35-
gracefulShutdownTimeout: Option[FiniteDuration]
36-
): Resource[IO, Port] = {
37-
val service: WebSocketBuilder2[IO] => HttpApp[IO] =
38-
wsb => routes.map(_.apply(wsb)).reduceK.orNotFound
39-
34+
def buildServer(
35+
makeService: WebSocketBuilder2[IO] => HttpApp[IO],
36+
gracefulShutdownTimeout: Option[FiniteDuration] = None
37+
): Resource[IO, Server] =
4038
serverBuilder
41-
.withHttpWebSocketApp(service)
39+
.withHttpWebSocketApp(makeService)
4240
.withShutdownTimeout(
4341
gracefulShutdownTimeout.getOrElse(0.seconds) // no need to wait unless it's explicitly required by test
4442
)
4543
.build
44+
45+
override def server(
46+
routes: NonEmptyList[Routes],
47+
gracefulShutdownTimeout: Option[FiniteDuration]
48+
): Resource[IO, Port] =
49+
buildServer(wsb => routes.map(_.apply(wsb)).reduceK.orNotFound, gracefulShutdownTimeout)
4650
.map(_.address.getPort)
47-
}
4851
}

0 commit comments

Comments
 (0)