Merge pull request #1261 from mariansollmann/issue-1261

Add ip to createRequest mock in test helper
cargomedia · Jun 5, 2014 · c4495be · c4495be
2 parents 7483fd0 + 3b82a45
commit c4495be
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/tests/helpers/CMTest/library/CMTest/TestCase.php b/tests/helpers/CMTest/library/CMTest/TestCase.php
@@ -161,19 +161,21 @@ public function getResponseForm($formClassName, $actionName, array $data, $compo
     /**
      * @param string $url
      * @param array  $query
-     * @return CM_Request_Post
+     * @return CM_Request_Post|PHPUnit_Framework_MockObject_MockObject
      */
     public function createRequest($url, array $query = null) {
         $url = (string) $url;
-        $request = $this->getMockBuilder('CM_Request_Post')->setConstructorArgs(array($url))->setMethods(array('getQuery'))->getMock();
+        $ip = '16909060';
+        $request = $this->getMockBuilder('CM_Request_Post')->setConstructorArgs(array($url))->setMethods(array('getQuery', 'getIp'))->getMock();
         $request->expects($this->any())->method('getQuery')->will($this->returnValue($query));
+        $request->expects($this->any())->method('getIp')->will($this->returnValue($ip));
         return $request;
     }
 
     /**
      * @param CM_FormAction_Abstract $action
      * @param array|null             $data
-     * @return CM_Request_Post
+     * @return CM_Request_Post|PHPUnit_Framework_MockObject_MockObject
      */
     public function createRequestFormAction(CM_FormAction_Abstract $action, array $data = null) {
         $actionName = $action->getName();