Merge pull request #7 from Druid33/mock_request_service

request service should be removed before changing his definition

Author: Jeckerson

src/Codeception/Lib/Connector/Phalcon4.php

@@ -3,17 +3,17 @@
 namespace Codeception\Lib\Connector;
 
 use Closure;
+use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
+use Codeception\Util\Stub;
 use Phalcon\Di;
 use Phalcon\Http;
-use RuntimeException;
-use ReflectionProperty;
-use Codeception\Util\Stub;
 use Phalcon\Mvc\Application;
-use Symfony\Component\BrowserKit\Cookie;
-use Symfony\Component\BrowserKit\AbstractBrowser as Client;
 use Phalcon\Mvc\Micro as MicroApplication;
+use ReflectionProperty;
+use RuntimeException;
+use Symfony\Component\BrowserKit\AbstractBrowser as Client;
+use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\BrowserKit\Response;
-use Codeception\Lib\Connector\Shared\PhpSuperGlobalsConverter;
 
 class Phalcon4 extends Client
 {
@@ -110,6 +110,9 @@ public function doRequest($request)
         Di::reset();
         Di::setDefault($di);
 
+        if ($di->has('request')) {
+            $di->remove('request');
+        }
         $di['request'] = Stub::construct($phRequest, [], ['getRawBody' => $request->getContent()]);
 
         $response = $application->handle($pathString);

tests/unit/Phalcon4ConnectorTest.php

@@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+use Codeception\Lib\Connector\Phalcon4 as PhalconConnector;
+use Codeception\Module\Phalcon4;
+use Symfony\Component\BrowserKit\Request;
+
+class Phalcon4ConnectorTest extends \Codeception\Test\Unit
+{
+    protected function getPhalconModule(): Phalcon4
+    {
+        $container = \Codeception\Util\Stub::make('Codeception\Lib\ModuleContainer');
+        $module = new Phalcon4($container);
+        $module->_setConfig([
+            'bootstrap'  => 'tests/_data/bootstrap.php',
+            'cleanup'    => true,
+            'savepoints' => true,
+            'session'    => 'Codeception\Lib\Connector\Phalcon4\MemorySession'
+        ]);
+        $module->_initialize();
+        return $module;
+    }
+
+    public function testConstruct(): void
+    {
+        $connector = new PhalconConnector();
+        $this->assertInstanceOf(PhalconConnector::class, $connector);
+    }
+
+    public function testDoRequest(): void
+    {
+        $module = $this->getPhalconModule();
+        $test = new Codeception\Test\Unit();
+        $module->_before($test);
+
+        $connector = $module->client;
+
+        // parameters for Request object
+        $uri = '/';
+        $method = 'GET';
+        $params = [
+            'first' => 'one',
+            'second' => 'two'
+        ];
+        $files = [
+            'file' => [
+                'name' => 'SomeFile.ext',
+                'tmp_name' => 'SomeFile.ext',
+                'error' => false
+            ]
+        ];
+        $cookies = [
+            'token' => 'asdev257'
+        ];
+        $server = [
+            'HTTP_HOST' => 'localhost',
+            'SERVER_NAME' => 'my pc',
+            'SERVER_ADDR' => '127.0.0.1',
+        ];
+        $content = "this is request content";
+
+        $request = new Request(
+            $uri,
+            $method,
+            $params,
+            $files,
+            $cookies,
+            $server,
+            $content
+        );
+
+        // send request
+        $response = $connector->doRequest($request);
+        $this->assertSame(200, $response->getStatusCode());
+
+        /** @var Phalcon\Http\Request $requestService*/
+        $requestService = $module->grabServiceFromContainer('request');
+
+        // assert request uri
+        $this->assertSame($uri, $requestService->getURI());
+
+        // assert request method
+        $this->assertSame($method, $requestService->getMethod());
+
+        // assert reques paramters
+        $this->assertSame($params['first'], $requestService->get('first'));
+        $this->assertSame($params['second'], $requestService->get('second'));
+
+        // assert uploaded file
+        $this->assertTrue($requestService->hasFiles());
+        /** @var Phalcon\Http\Request\File $uploadedFile */
+        $uploadedFile = $requestService->getUploadedFiles()[0];
+        $this->assertSame($files['file']['name'], $uploadedFile->getName());
+        $this->assertSame($files['file']['tmp_name'], $uploadedFile->getTempName());
+        $this->assertSame('ext', $uploadedFile->getExtension());
+
+        // assert server parameter
+        $this->assertSame($server['HTTP_HOST'], $requestService->getServer('HTTP_HOST'));
+
+        // assert request body
+        $this->assertSame($content, $requestService->getRawBody());
+
+        $module->_after($test);
+    }
+}