From b12800403d0a0ff3defdc79303c2b4e277f05e9b Mon Sep 17 00:00:00 2001 From: Joel Thibault Date: Wed, 27 Mar 2024 13:14:14 -0400 Subject: [PATCH] fix tests --- .../dsde/workbench/leonardo/http/api/HttpRoutesSpec.scala | 7 +++++++ .../dsde/workbench/leonardo/http/api/ProxyRoutesSpec.scala | 2 ++ .../dsde/workbench/leonardo/http/api/TestLeoRoutes.scala | 3 +++ .../dsde/workbench/leonardo/provider/LeoProvider.scala | 2 ++ 4 files changed, 14 insertions(+) diff --git a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/HttpRoutesSpec.scala b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/HttpRoutesSpec.scala index 1ed93a49fcc..21c0156cfd0 100644 --- a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/HttpRoutesSpec.scala +++ b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/HttpRoutesSpec.scala @@ -60,6 +60,7 @@ class HttpRoutesSpec val routes = new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, createGcpOnlyServicesRegistry(), MockDiskV2ServiceInterp, @@ -73,6 +74,7 @@ class HttpRoutesSpec val httpRoutesAzureOnly = new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, createGcpOnlyServicesRegistry(), MockDiskV2ServiceInterp, @@ -88,6 +90,7 @@ class HttpRoutesSpec val routesWithStrictRefererConfig = new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, createGcpOnlyServicesRegistry(), MockDiskV2ServiceInterp, @@ -102,6 +105,7 @@ class HttpRoutesSpec val routesWithWildcardReferer = new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, createGcpOnlyServicesRegistry(), MockDiskV2ServiceInterp, @@ -116,6 +120,7 @@ class HttpRoutesSpec val routesWithDisabledRefererConfig = new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, createGcpOnlyServicesRegistry(), MockDiskV2ServiceInterp, @@ -963,6 +968,7 @@ class HttpRoutesSpec new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, gcpOnlyServicesRegistry, MockDiskV2ServiceInterp, @@ -984,6 +990,7 @@ class HttpRoutesSpec new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, gcpOnlyServicesRegistry, MockDiskV2ServiceInterp, diff --git a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/ProxyRoutesSpec.scala b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/ProxyRoutesSpec.scala index c835322fd10..c182c232649 100644 --- a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/ProxyRoutesSpec.scala +++ b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/ProxyRoutesSpec.scala @@ -551,6 +551,7 @@ class ProxyRoutesSpec val httpRoutes = new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, gcpOnlyServicesRegistry, MockDiskV2ServiceInterp, @@ -728,6 +729,7 @@ class ProxyRoutesSpec new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, gcpOnlyServicesRegistry, MockDiskV2ServiceInterp, diff --git a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/TestLeoRoutes.scala b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/TestLeoRoutes.scala index 8f1e8da4803..7445745914e 100644 --- a/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/TestLeoRoutes.scala +++ b/http/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/http/api/TestLeoRoutes.scala @@ -173,6 +173,7 @@ trait TestLeoRoutes { MockGoogleOAuth2Service ) + val helloService = new HelloService() val statusService = new StatusService(mockSamDAO, testDbRef, pollInterval = 1.second) val timedUserInfo = defaultUserInfo.copy(tokenExpiresIn = tokenAge) @@ -208,6 +209,7 @@ trait TestLeoRoutes { val httpRoutes = new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, gcpOnlyServicesRegistry, MockDiskV2ServiceInterp, @@ -222,6 +224,7 @@ trait TestLeoRoutes { val timedHttpRoutes = new HttpRoutes( openIdConnectionConfiguration, + helloService, statusService, gcpOnlyServicesRegistry, MockDiskV2ServiceInterp, diff --git a/pact4s/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/provider/LeoProvider.scala b/pact4s/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/provider/LeoProvider.scala index 95a8eea1dd1..41c0224b409 100644 --- a/pact4s/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/provider/LeoProvider.scala +++ b/pact4s/src/test/scala/org/broadinstitute/dsde/workbench/leonardo/provider/LeoProvider.scala @@ -37,6 +37,7 @@ class LeoProvider extends AnyFlatSpec with BeforeAndAfterAll with PactVerifier { implicit val system: ActorSystem = ActorSystem("leotests") val mockOpenIDConnectConfiguration: OpenIDConnectConfiguration = mock[OpenIDConnectConfiguration] + val mockHelloService: HelloService = mock[HelloService] val mockStatusService: StatusService = mock[StatusService] val mockProxyService: ProxyService = mock[ProxyService] val mockRuntimeService: RuntimeService[IO] = mock[RuntimeService[IO]] @@ -63,6 +64,7 @@ class LeoProvider extends AnyFlatSpec with BeforeAndAfterAll with PactVerifier { val routes = new HttpRoutes( mockOpenIDConnectConfiguration, + mockHelloService, mockStatusService, gcpOnlyServicesRegistry, mockDiskV2Service,