Merge remote-tracking branch 'pr/18985' into release-2.3-dev

2015-12-12 16:59:05 +01:00 · 2015-12-12 16:59:05 +01:00 · 819c1ef504
commit 819c1ef504
parent 15cc65ce9d 5aa83594fa
14 changed files with 421 additions and 23 deletions
--- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala
+++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala
@ -266,6 +266,16 @@ object TestSubscriber {
      self
    }

+    /**
+     * Fluent DSL
+     *
+     * Expect a stream element during specified time or timeout.
+     */
+    def expectNext(d: FiniteDuration, element: I): Self = {
+      probe.expectMsg(d, OnNext(element))
+      self
+    }
+
    /**
     * Fluent DSL
     *