Skip to content

Commit

Permalink
Merge branch 'master' into global-queue
Browse files Browse the repository at this point in the history
  • Loading branch information
jsor committed Jul 3, 2015
2 parents 6aedeac + 170bb53 commit e855942
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions tests/PromiseTest/RejectTestTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ public function rejectShouldMakePromiseImmutable()
->with($this->identicalTo(1));

$adapter->promise()
->then(null, function ($value) use ($adapter) {
$adapter->reject(3);

return Promise\reject($value);
})
->then(
$this->expectCallableNever(),
$mock
Expand Down
5 changes: 5 additions & 0 deletions tests/PromiseTest/ResolveTestTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ public function resolveShouldMakePromiseImmutable()
->with($this->identicalTo(1));

$adapter->promise()
->then(function ($value) use ($adapter) {
$adapter->resolve(3);

return $value;
})
->then(
$mock,
$this->expectCallableNever()
Expand Down

0 comments on commit e855942

Please sign in to comment.