diff options
| -rw-r--r-- | kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala | 16 | ||||
| -rw-r--r-- | project/Projects.scala | 3 |
2 files changed, 3 insertions, 16 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) diff --git a/project/Projects.scala b/project/Projects.scala index f3f7f17d..3be81e84 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -87,6 +87,7 @@ object Projects extends Build { .settings(basicSettings: _*) .settings(siteSettings: _*) .settings(aspectJSettings: _*) + .settings(noPublishing: _*) .dependsOn(kamonCore) .settings( libraryDependencies ++= @@ -94,5 +95,5 @@ object Projects extends Build { test(scalatest, akkaTestKit)) - val noPublishing = Seq(publish := (), publishLocal := ()) + val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := false) } |