Merge pull request #1541 from softwaremill/tests-fix

Fixed tests suites for play and zio-http
softwaremill · Oct 19, 2021 · bf79d5a · bf79d5a
2 parents 1b1eaf1 + 5476209
commit bf79d5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/server/play-server/src/test/scala/sttp/tapir/server/play/PlayServerTest.scala b/server/play-server/src/test/scala/sttp/tapir/server/play/PlayServerTest.scala
@@ -31,8 +31,8 @@ class PlayServerTest extends TestSuite {
 
       new ServerBasicTests(createServerTest, interpreter, multipleValueHeaderSupport = false, inputStreamSupport = false).tests() ++
         new ServerMultipartTests(createServerTest, multipartInlineHeaderSupport = false).tests() ++
-        new AllServerTests(createServerTest, interpreter, backend, basic = false, multipart = false).tests()
-      new ServerStreamingTests(createServerTest, AkkaStreams).tests() ++
+        new AllServerTests(createServerTest, interpreter, backend, basic = false, multipart = false, reject = false).tests() ++
+        new ServerStreamingTests(createServerTest, AkkaStreams).tests() ++
         new PlayServerWithContextTest(backend).tests()
     }
   }

diff --git a/server/zio-http-server/src/test/scala/sttp/tapir/server/ziohttp/ZioHttpServerTest.scala b/server/zio-http-server/src/test/scala/sttp/tapir/server/ziohttp/ZioHttpServerTest.scala
@@ -33,8 +33,9 @@ class ZioHttpServerTest extends TestSuite {
         ).tests() ++
           // TODO: re-enable static content once a newer zio http is available. Currently these tests often fail with:
           // Cause: java.io.IOException: parsing HTTP/1.1 status line, receiving [f2 content], parser state [STATUS_LINE]
-          new AllServerTests(createServerTest, interpreter, backend, basic = false, staticContent = false).tests()
-        new ServerStreamingTests(createServerTest, ZioStreams).tests()
+          new AllServerTests(createServerTest, interpreter, backend, basic = false, staticContent = false, multipart = false, file = false)
+            .tests() ++
+          new ServerStreamingTests(createServerTest, ZioStreams).tests()
     }
   }
 }