Use shortcut factories for simple callable mocks

Author: jsor

tests/FunctionAnyTest.php

@@ -107,13 +107,7 @@ public function shouldCancelInputArrayPromises()
     /** @test */
     public function shouldNotCancelOtherPendingInputArrayPromisesIfOnePromiseFulfills()
     {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->never())
-            ->method('__invoke');
-
-
-        $deferred = new Deferred($mock);
+        $deferred = new Deferred($this->expectCallableNever());
         $deferred->resolve();
 
         $promise2 = new Promise(function() {}, $this->expectCallableNever());

tests/FunctionSomeTest.php

@@ -134,12 +134,7 @@ public function shouldCancelInputArrayPromises()
     /** @test */
     public function shouldCancelOtherPendingInputArrayPromisesIfEnoughPromisesFulfill()
     {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->never())
-            ->method('__invoke');
-
-        $deferred = new Deferred($mock);
+        $deferred = new Deferred($this->expectCallableNever());
         $deferred->resolve();
 
         $promise2 = new Promise(function() {}, $this->expectCallableNever());
@@ -150,12 +145,7 @@ public function shouldCancelOtherPendingInputArrayPromisesIfEnoughPromisesFulfil
     /** @test */
     public function shouldNotCancelOtherPendingInputArrayPromisesIfEnoughPromisesReject()
     {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->never())
-            ->method('__invoke');
-
-        $deferred = new Deferred($mock);
+        $deferred = new Deferred($this->expectCallableNever());
         $deferred->reject();
 
         $promise2 = new Promise(function() {}, $this->expectCallableNever());

tests/Internal/CancellationQueueTest.php

@@ -95,11 +95,6 @@ public function rethrowsExceptionsThrownFromCancel()
 
     private function getCancellableDeferred()
     {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke');
-
-        return new Deferred($mock);
+        return new Deferred($this->expectCallableOnce());
     }
 }

tests/LazyPromiseTest.php

@@ -29,23 +29,13 @@ public function getPromiseTestAdapter(callable $canceller = null)
     /** @test */
     public function shouldNotCallFactoryIfThenIsNotInvoked()
     {
-        $factory = $this->createCallableMock();
-        $factory
-            ->expects($this->never())
-            ->method('__invoke');
-
-        new LazyPromise($factory);
+        new LazyPromise($this->expectCallableNever());
     }
 
     /** @test */
     public function shouldCallFactoryIfThenIsInvoked()
     {
-        $factory = $this->createCallableMock();
-        $factory
-            ->expects($this->once())
-            ->method('__invoke');
-
-        $p = new LazyPromise($factory);
+        $p = new LazyPromise($this->expectCallableOnce());
         $p->then();
     }
 

tests/PromiseTest/CancelTestTrait.php

@@ -116,12 +116,7 @@ public function cancelShouldHaveNoEffectIfCancellerDoesNothing()
     /** @test */
     public function cancelShouldCallCancellerFromDeepNestedPromiseChain()
     {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke');
-
-        $adapter = $this->getPromiseTestAdapter($mock);
+        $adapter = $this->getPromiseTestAdapter($this->expectCallableOnce());
 
         $promise = $adapter->promise()
             ->then(function () {