Enhancement: Simplify mocking

zendframework · Feb 6, 2015 · a760788 · a760788
1 parent 611bef7
commit a760788
Showing 1 changed file with 20 additions and 54 deletions.
diff --git a/module/ZfModule/test/ZfModuleTest/Service/ModuleTest.php b/module/ZfModule/test/ZfModuleTest/Service/ModuleTest.php
@@ -107,20 +107,11 @@ public function testListUserModuleListsCurrentUsersModulesFromApiFoundInDatabase
         $currentUserService
             ->expects($this->once())
             ->method('repos')
-            ->with($this->logicalAnd(
-                $this->arrayHasKey('type'),
-                $this->arrayHasKey('per_page')
-            ))
-            ->willReturnCallback(function ($params) use ($repository) {
-
-                $repositories = [];
-
-                if ('all' === $params['type'] && 100 === $params['per_page']) {
-                    array_push($repositories, $repository);
-                }
-
-                return new Mock\Collection\RepositoryCollection($repositories);
-            })
+            ->with($this->equalTo([
+                'type' => 'all',
+                'per_page' => 100,
+            ]))
+            ->willReturn(new Mock\Collection\RepositoryCollection([$repository]))
         ;
 
         $githubClient = $this->getMockBuilder(Client::class)->getMock();
@@ -159,20 +150,11 @@ public function testListUserModulesDoesNotLookupModulesFromApiWhereUserHasNoPush
         $currentUserService
             ->expects($this->once())
             ->method('repos')
-            ->with($this->logicalAnd(
-                $this->arrayHasKey('type'),
-                $this->arrayHasKey('per_page')
-            ))
-            ->willReturnCallback(function ($params) use ($repository) {
-
-                $repositories = [];
-
-                if ('all' === $params['type'] && 100 === $params['per_page']) {
-                    array_push($repositories, $repository);
-                }
-
-                return new Mock\Collection\RepositoryCollection($repositories);
-            })
+            ->with($this->equalTo([
+                'type' => 'all',
+                'per_page' => 100,
+            ]))
+            ->willReturn(new Mock\Collection\RepositoryCollection([$repository]))
         ;
 
         $githubClient = $this->getMockBuilder(Client::class)->getMock();
@@ -209,19 +191,11 @@ public function testListUsersModuleDoesNotLookupModulesFromApiThatAreForks()
         $currentUserService
             ->expects($this->once())
             ->method('repos')
-            ->with($this->logicalAnd(
-                $this->arrayHasKey('type'),
-                $this->arrayHasKey('per_page')
-            ))
-            ->willReturnCallback(function ($params) use ($repository) {
-                $repositories = [];
-
-                if ('all' === $params['type'] && 100 === $params['per_page']) {
-                    array_push($repositories, $repository);
-                }
-
-                return new Mock\Collection\RepositoryCollection($repositories);
-            })
+            ->with($this->equalTo([
+                'type' => 'all',
+                'per_page' => 100,
+            ]))
+            ->willReturn(new Mock\Collection\RepositoryCollection([$repository]))
         ;
 
         $githubClient = $this->getMockBuilder(Client::class)->getMock();
@@ -265,19 +239,11 @@ public function testListUserModulesDoesNotListModulesFromApiNotFoundInDatabase()
         $currentUserService
             ->expects($this->once())
             ->method('repos')
-            ->with($this->logicalAnd(
-                $this->arrayHasKey('type'),
-                $this->arrayHasKey('per_page')
-            ))
-            ->willReturnCallback(function ($params) use ($repository) {
-                $repositories = [];
-
-                if ('all' === $params['type'] && 100 === $params['per_page']) {
-                    array_push($repositories, $repository);
-                }
-
-                return new Mock\Collection\RepositoryCollection($repositories);
-            })
+            ->with($this->equalTo([
+                'type' => 'all',
+                'per_page' => 100,
+            ]))
+            ->willReturn(new Mock\Collection\RepositoryCollection([$repository]))
         ;
 
         $githubClient = $this->getMockBuilder(Client::class)->getMock();