Merge pull request #47 from thephpleague/tests

Improve tests
thephpleague · Oct 30, 2016 · d693866 · d693866
2 parents 849169d + 7c5bce5
commit d693866
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/spec/QueueMiddlewareSpec.php b/spec/QueueMiddlewareSpec.php
@@ -8,6 +8,7 @@
 use League\Tactician\Bernard\QueueMiddleware;
 use League\Tactician\Middleware;
 use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
 
 final class QueueMiddlewareSpec extends ObjectBehavior
 {
@@ -30,22 +31,19 @@ function it_executes_a_command(Producer $producer, Message $command)
     {
         $producer->produce($command)->shouldBeCalled();
 
-        $this->execute(
-            $command,
-            function () {}
-        );
+        $this->execute($command, function () {});
     }
 
     function it_executes_invokes_the_next_middleware(Producer $producer, Middleware $middleware, Command $command)
     {
         $producer->produce($command)->shouldNotBeCalled();
-        $next = function () {};
-        $middleware->execute($command, $next)->willReturn(true);
+
+        $middleware->execute($command, Argument::type('callable'))->shouldBeCalled();
 
         $this->execute(
             $command,
-            function ($command) use ($middleware, $next) {
-                return $middleware->execute($command, $next);
+            function ($command) use ($middleware) {
+                return $middleware->getWrappedObject()->execute($command, function () {});
             }
         );
     }
@@ -54,13 +52,13 @@ function it_unwraps_a_command(Producer $producer, Message $command, Middleware $
     {
         $queuedCommand = new QueuedCommand($command->getWrappedObject());
         $producer->produce($command)->shouldNotBeCalled();
-        $next = function () {};
-        $middleware->execute($command, $next)->willReturn(true);
+
+        $middleware->execute($command, Argument::type('callable'))->shouldBeCalled();
 
         $this->execute(
             $queuedCommand,
-            function ($command) use ($middleware, $next) {
-                return $middleware->execute($command, $next);
+            function ($command) use ($middleware) {
+                return $middleware->getWrappedObject()->execute($command, function () {});
             }
         );
     }

diff --git a/spec/QueuedCommandSpec.php b/spec/QueuedCommandSpec.php
@@ -18,7 +18,7 @@ function it_is_initializable()
         $this->shouldHaveType(QueuedCommand::class);
     }
 
-    function it_has_a_queueable_command(Message $command)
+    function it_has_a_command_from_the_queue(Message $command)
     {
         $this->getCommand()->shouldReturn($command);
     }

diff --git a/spec/Receiver/SameBusReceiverSpec.php b/spec/Receiver/SameBusReceiverSpec.php
@@ -24,20 +24,20 @@ function it_is_initializable()
 
     function it_is_a_receiver()
     {
-        $this->shouldImplement(Receiver::class);
+        $this->shouldHaveType(Receiver::class);
     }
 
     function it_handles_a_message(CommandBus $commandBus, Message $command)
     {
-        $commandBus->handle(Argument::type(QueuedCommand::class))->willReturn(true);
+        $commandBus->handle(Argument::type(QueuedCommand::class))->shouldBeCalled();
 
-        $this->handle($command)->shouldReturn(true);
+        $this->handle($command);
     }
 
     function it_is_invokable(CommandBus $commandBus, Message $command)
     {
-        $commandBus->handle(Argument::type(QueuedCommand::class))->willReturn(true);
+        $commandBus->handle(Argument::type(QueuedCommand::class))->shouldBeCalled();
 
-        $this->__invoke($command)->shouldReturn(true);
+        $this->__invoke($command);
     }
 }
diff --git a/spec/Receiver/SeparateBusReceiverSpec.php b/spec/Receiver/SeparateBusReceiverSpec.php
@@ -22,20 +22,20 @@ function it_is_initializable()
 
     function it_is_a_receiver()
     {
-        $this->shouldImplement(Receiver::class);
+        $this->shouldHaveType(Receiver::class);
     }
 
     function it_handles_a_message(CommandBus $commandBus, Message $command)
     {
-        $commandBus->handle($command)->willReturn(true);
+        $commandBus->handle($command)->shouldBeCalled();
 
-        $this->handle($command)->shouldReturn(true);
+        $this->handle($command);
     }
 
     function it_is_invokable(CommandBus $commandBus, Message $command)
     {
-        $commandBus->handle($command)->willReturn(true);
+        $commandBus->handle($command)->shouldBeCalled();
 
-        $this->__invoke($command)->shouldReturn(true);
+        $this->__invoke($command);
     }
 }