From e4f1ce36ef17f89b70a5360a4572f40456a6c759 Mon Sep 17 00:00:00 2001 From: 2beaucoup Date: Thu, 6 Aug 2015 10:57:43 +0200 Subject: [PATCH] =htp: reenable tests --- .../scala/akka/http/scaladsl/server/BasicRouteSpecs.scala | 5 ++--- .../server/directives/FileAndResourceDirectivesSpec.scala | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/BasicRouteSpecs.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/BasicRouteSpecs.scala index ba8c3e5d42..c732923631 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/BasicRouteSpecs.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/BasicRouteSpecs.scala @@ -27,11 +27,10 @@ class BasicRouteSpecs extends RoutingSpec { } ~> check { rejections shouldEqual Seq(MethodRejection(GET), MethodRejection(PUT)) } } "clear rejections that have already been 'overcome' by previous directives" in { - pending - /*Put() ~> { + Put() ~> { put { parameter('yeah) { echoComplete } } ~ get { completeOk } - } ~> check { rejection shouldEqual MissingQueryParamRejection("yeah") }*/ + } ~> check { rejection shouldEqual MissingQueryParamRejection("yeah") } } } diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectivesSpec.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectivesSpec.scala index 86c7dfb32a..206cc2c712 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectivesSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectivesSpec.scala @@ -20,7 +20,7 @@ import akka.http.scaladsl.TestUtils.writeAllText class FileAndResourceDirectivesSpec extends RoutingSpec with Inspectors with Inside { override def testConfigSource = - """akka.http.scaladsl.routing { + """akka.http.routing { | file-chunking-threshold-size = 16 | file-chunking-chunk-size = 8 | range-coalescing-threshold = 1 @@ -72,7 +72,6 @@ class FileAndResourceDirectivesSpec extends RoutingSpec with Inspectors with Ins } "return multiple ranges from a file at once" in { - pending // FIXME: reactivate val file = File.createTempFile("partialTest", null) try { writeAllText("ABCDEFGHIJKLMNOPQRSTUVWXYZ", file)