Merge remote-tracking branch 'upstream/master'

src/PHPUnit/Controller/AbstractControllerTestCase.php

@@ -10,11 +10,11 @@
 
 use PHPUnit_Framework_TestCase;
 use PHPUnit_Framework_ExpectationFailedException;
+use Zend\Console\Console;
 use Zend\EventManager\StaticEventManager;
 use Zend\Http\Request as HttpRequest;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
-use Zend\Mvc\SendResponseListener;
 use Zend\Stdlib\Exception\LogicException;
 use Zend\Stdlib\Parameters;
 use Zend\Stdlib\ResponseInterface;
@@ -39,6 +39,12 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
      */
     protected $useConsoleRequest = false;
 
+    /**
+     * Flag console used before tests
+     * @var boolean
+     */
+    private $usedConsoleBackup;
+
     /**
      * Trace error when exception is throwed in application
      * @var boolean
@@ -50,9 +56,18 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        $this->usedConsoleBackup = Console::isConsole();
         $this->reset();
     }
 
+    /**
+     * Restore params
+     */
+    public function tearDown()
+    {
+        Console::overrideIsConsole($this->usedConsoleBackup);
+    }
+
     /**
      * Get the trace error flag
      * @return boolean
@@ -134,25 +149,12 @@ public function getApplication()
             return $this->application;
         }
         $appConfig = $this->applicationConfig;
-        if (!$this->useConsoleRequest) {
-            $consoleServiceConfig = array(
-                'service_manager' => array(
-                    'factories' => array(
-                        'ServiceListener' => 'Zend\Test\PHPUnit\Mvc\Service\ServiceListenerFactory',
-                    ),
-                ),
-            );
-            $appConfig = array_replace_recursive($appConfig, $consoleServiceConfig);
-        }
+        Console::overrideIsConsole($this->getUseConsoleRequest());
         $this->application = Application::init($appConfig);
 
         $events = $this->application->getEventManager();
-        foreach ($events->getListeners(MvcEvent::EVENT_FINISH) as $listener) {
-            $callback = $listener->getCallback();
-            if (is_array($callback) && $callback[0] instanceof SendResponseListener) {
-                $events->detach($listener);
-            }
-        }
+        $events->detach($this->application->getServiceManager()->get('SendResponseListener'));
+
         return $this->application;
     }
 
@@ -195,7 +197,8 @@ public function url($url, $method = HttpRequest::METHOD_GET, $params = array())
     {
         $request = $this->getRequest();
         if ($this->useConsoleRequest) {
-            $params = preg_split('#\s+#', $url);
+            preg_match_all('/(--\S+[= ]"\S*\s*\S*")|(--\S+=\S+|--\S+\s\S+|\S+)/', $url, $matches);
+            $params = str_replace(array(' "', '"'), array('=', ''), $matches[0]);
             $request->params()->exchangeArray($params);
             return $this;
         }
@@ -211,10 +214,19 @@ public function url($url, $method = HttpRequest::METHOD_GET, $params = array())
 
         if ($method == HttpRequest::METHOD_POST) {
             $post = $params;
-        }
-
-        if ($method == HttpRequest::METHOD_GET) {
+        } elseif ($method == HttpRequest::METHOD_GET) {
             $query = array_merge($query, $params);
+        } elseif ($method == HttpRequest::METHOD_PUT) {
+            array_walk($params,
+                function(&$item, $key) { $item = $key . '=' . $item; }
+            );
+            $content = implode('&', $params);
+            $request->setContent($content);
+        } elseif ($params) {
+            trigger_error(
+                'Additional params is only supported by GET, POST and PUT HTTP method',
+                E_USER_NOTICE
+            );
         }
 
         $request->setMethod($method);

test/PHPUnit/Controller/AbstractConsoleControllerTestCaseTest.php

@@ -94,4 +94,22 @@ public function testNotAssertConsoleOutputContains()
         $this->setExpectedException('PHPUnit_Framework_ExpectationFailedException');
         $this->assertNotConsoleOutputContains('foo');
     }
+
+    public function testAssertMatchedArgumentsWithValue()
+    {
+        $this->dispatch('filter --date="2013-03-07 00:00:00" --id=10 --text="custom text"');
+        $routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
+        $this->assertEquals("2013-03-07 00:00:00", $routeMatch->getParam('date'));
+        $this->assertEquals("10", $routeMatch->getParam('id'));
+        $this->assertEquals("custom text", $routeMatch->getParam('text'));
+    }
+
+    public function testAssertMatchedArgumentsWithValueWithoutEqualsSign()
+    {
+        $this->dispatch('filter --date "2013-03-07 00:00:00" --id=10 --text="custom text"');
+        $routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
+        $this->assertEquals("2013-03-07 00:00:00", $routeMatch->getParam('date'));
+        $this->assertEquals("10", $routeMatch->getParam('id'));
+        $this->assertEquals("custom text", $routeMatch->getParam('text'));
+    }
 }

test/PHPUnit/Controller/AbstractControllerTestCaseTest.php

@@ -9,6 +9,7 @@
  */
 namespace ZendTest\Test\PHPUnit\Controller;
 
+use Zend\Console\Console;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
 use Zend\Stdlib\RequestInterface;
@@ -61,6 +62,26 @@ public function testApplicationClass()
         $this->assertEquals($applicationClass, 'Zend\Mvc\Application');
     }
 
+    public function testApplicationClassAndTestRestoredConsoleFlag()
+    {
+        $this->assertTrue(Console::isConsole());
+        $this->getApplication();
+        $this->assertFalse(Console::isConsole());
+        $this->tearDown();
+        $this->assertTrue(Console::isConsole());
+
+        Console::overrideIsConsole(false);
+        parent::setUp();
+
+        $this->assertFalse(Console::isConsole());
+        $this->getApplication();
+        $this->assertFalse(Console::isConsole());
+
+        parent::tearDown();
+
+        $this->assertFalse(Console::isConsole());
+    }
+
     public function testApplicationServiceLocatorClass()
     {
         $smClass = get_class($this->getApplicationServiceLocator());

test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php

@@ -469,12 +469,22 @@ public function testAssertQueryWithDynamicPostParams()
     public function testAssertQueryWithDynamicPostParamsInDispatchMethod()
     {
         $this->dispatch('/tests', 'POST', array('num_post' => 5));
+        $request = $this->getRequest();
+        $this->assertEquals($request->getMethod(), 'POST');
         $this->assertQueryCount('div.post', 5);
         $this->assertXpathQueryCount('//div[@class="post"]', 5);
         $this->assertQueryCount('div.get', 0);
         $this->assertXpathQueryCount('//div[@class="get"]', 0);
     }
 
+    public function testAssertQueryWithDynamicPutParamsInDispatchMethod()
+    {
+        $this->dispatch('/tests', 'PUT', array('num_post' => 5, 'foo' => 'bar'));
+        $request = $this->getRequest();
+        $this->assertEquals($request->getMethod(), 'PUT');
+        $this->assertEquals('num_post=5&foo=bar', $request->getContent());
+    }
+    /*
     public function testAssertUriWithHostname()
     {
         $this->dispatch('http://my.domain.tld:443');

test/PHPUnit/Controller/ModuleDependenciesTest.php → test/PHPUnit/ModuleDependenciesTest.php

@@ -22,7 +22,7 @@ class ModuleDependenciesTest extends AbstractHttpControllerTestCase
     public function testDependenciesModules()
     {
         $this->setApplicationConfig(
-            include __DIR__ . '/../../_files/application.config.with.dependencies.php'
+            include __DIR__ . '/../_files/application.config.with.dependencies.php'
         );
         $sm = $this->getApplicationServiceLocator();
         $this->assertEquals(true, $sm->has('FooObject'));
@@ -36,7 +36,7 @@ public function testDependenciesModules()
     public function testBadDependenciesModules()
     {
         $this->setApplicationConfig(
-            include __DIR__ . '/../../_files/application.config.with.dependencies.disabled.php'
+            include __DIR__ . '/../_files/application.config.with.dependencies.disabled.php'
         );
         $sm = $this->getApplicationServiceLocator();
         $this->assertEquals(false, $sm->has('FooObject'));

test/_files/Baz/config/module.config.php

@@ -13,6 +13,16 @@
                         ),
                     ),
                 ),
+                'arguments' => array(
+                    'type' => 'simple',
+                    'options' => array(
+                        'route'    => 'filter --date= --id= --text=',
+                        'defaults' => array(
+                            'controller' => 'baz_index',
+                            'action'     => 'console',
+                        ),
+                    ),
+                ),
             ),
         ),
     ),