diff options
author | Ivan Topolnak <itopolnak@despegar.com> | 2014-04-24 18:05:37 -0300 |
---|---|---|
committer | Ivan Topolnak <itopolnak@despegar.com> | 2014-04-24 18:05:37 -0300 |
commit | fc4c61e1a8d2515b6c7d4ab32400154f490ceccb (patch) | |
tree | aa6878b36613d6c45c2d657fe3679d28e23ed0ea /kamon-play/src/test/scala/kamon/play | |
parent | 5cf929c839883d7a6b28929320efd7a8c525f27b (diff) | |
parent | 3b90e0382ea1dd1b66b43beea20aef7007806142 (diff) | |
download | Kamon-fc4c61e1a8d2515b6c7d4ab32400154f490ceccb.tar.gz Kamon-fc4c61e1a8d2515b6c7d4ab32400154f490ceccb.tar.bz2 Kamon-fc4c61e1a8d2515b6c7d4ab32400154f490ceccb.zip |
Merge branch 'master' into release-0.2
Diffstat (limited to 'kamon-play/src/test/scala/kamon/play')
-rw-r--r-- | kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala index 0c4ac57b..1ba82dc5 100644 --- a/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala @@ -24,7 +24,6 @@ import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future import org.junit.runner.RunWith import org.specs2.runner.JUnitRunner -import play.api.mvc.AsyncResult import play.api.test.FakeApplication import kamon.play.action.TraceName @@ -33,15 +32,7 @@ class RequestInstrumentationSpec extends PlaySpecification { System.setProperty("config.file", "./kamon-play/src/test/resources/conf/application.conf") - val appWithRoutes = FakeApplication(withRoutes = { - case ("GET", "/asyncResult") ⇒ - Action { - AsyncResult { - scala.concurrent.Future { - Ok("AsyncResult") - } - } - } + def appWithRoutes = FakeApplication(withRoutes = { case ("GET", "/async") ⇒ Action.async { Future { @@ -76,11 +67,6 @@ class RequestInstrumentationSpec extends PlaySpecification { private val traceTokenHeader = traceTokenHeaderName -> traceTokenValue "the Request instrumentation" should { - "respond to the asyncResult action with X-Trace-Token" in new WithServer(appWithRoutes) { - val Some(result) = route(FakeRequest(GET, "/asyncResult").withHeaders(traceTokenHeader)) - header(traceTokenHeaderName, result) must equalTo(expectedToken) - } - "respond to the Async Action with X-Trace-Token" in new WithServer(appWithRoutes) { val Some(result) = route(FakeRequest(GET, "/async").withHeaders(traceTokenHeader)) header(traceTokenHeaderName, result) must equalTo(expectedToken) |