No more mocks here!

Author: natanfelles

tests/system/CodeIgniterTest.php

@@ -3,7 +3,7 @@
 use Config\App;
 use Tests\Support\MockCodeIgniter;
 use CodeIgniter\Router\RouteCollection;
-use Tests\Support\Autoloader\MockFileLocator;
+use \CodeIgniter\Config\Services;
 
 /**
  * @backupGlobals enabled
@@ -135,7 +135,7 @@ public function testRun404OverrideByClosure()
 		$_SERVER['argc'] = 2;
 
 		// Inject mock router.
-		$routes = new RouteCollection(new MockFileLocator(new \Config\Autoload()), new \Config\Modules());
+		$routes = new RouteCollection(Services::locator(), new \Config\Modules());
 		$routes->setAutoRoute(false);
 		$routes->set404Override(function () {
 			echo '404 Override by Closure.';

tests/system/CommonFunctionsTest.php

@@ -3,14 +3,12 @@
 use CodeIgniter\Session\Handlers\FileHandler;
 use CodeIgniter\HTTP\Response;
 use Config\App;
-use Config\Autoload;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
 use Config\Logger;
-use Tests\Support\Autoloader\MockFileLocator;
 use Tests\Support\HTTP\MockIncomingRequest;
 use Tests\Support\Log\TestLogger;
 use Tests\Support\Session\MockSession;
@@ -102,7 +100,9 @@ public function testRedirectReturnsRedirectResponse()
 		$_SERVER['REQUEST_METHOD'] = 'GET';
 
 		$response = $this->createMock(\CodeIgniter\HTTP\Response::class);
-		$routes   = new \CodeIgniter\Router\RouteCollection(new \Tests\Support\Autoloader\MockFileLocator(new \Config\Autoload()), new \Config\Modules());
+		$routes   = new \CodeIgniter\Router\RouteCollection(
+			Services::locator(), new \Config\Modules()
+		);
 		\CodeIgniter\Services::injectMock('response', $response);
 		\CodeIgniter\Services::injectMock('routes', $routes);
 
@@ -267,7 +267,7 @@ public function testOldInput()
 		$this->config          = new App();
 		$this->config->baseURL = 'http://example.com';
 
-		$this->routes = new RouteCollection(new MockFileLocator(new Autoload()), new \Config\Modules());
+		$this->routes = new RouteCollection(Services::locator(), new \Config\Modules());
 		Services::injectMock('routes', $this->routes);
 
 		$this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
@@ -303,7 +303,7 @@ public function testOldInputArray()
 		$this->config          = new App();
 		$this->config->baseURL = 'http://example.com';
 
-		$this->routes = new RouteCollection(new MockFileLocator(new Autoload()), new \Config\Modules());
+		$this->routes = new RouteCollection(Services::locator(), new \Config\Modules());
 		Services::injectMock('routes', $this->routes);
 
 		$this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());

tests/system/HTTP/RedirectResponseTest.php

@@ -3,11 +3,9 @@
 namespace CodeIgniter\HTTP;
 
 use Config\App;
-use Config\Autoload;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Validation\Validation;
 use CodeIgniter\Router\RouteCollection;
-use Tests\Support\Autoloader\MockFileLocator;
 use Tests\Support\HTTP\MockIncomingRequest;
 
 class RedirectResponseTest extends \CIUnitTestCase
@@ -29,7 +27,7 @@ public function setUp()
 		$this->config          = new App();
 		$this->config->baseURL = 'http://example.com';
 
-		$this->routes = new RouteCollection(new MockFileLocator(new Autoload()), new \Config\Modules());
+		$this->routes = new RouteCollection(Services::locator(), new \Config\Modules());
 		Services::injectMock('routes', $this->routes);
 
 		$this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());

tests/system/Router/RouteCollectionTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace CodeIgniter\Router;
 
-use Tests\Support\Autoloader\MockFileLocator;
+use CodeIgniter\Config\Services;
 use CodeIgniter\Router\Exceptions\RouterException;
 
 /**
@@ -24,11 +24,9 @@ protected function getCollector(array $config = [], array $files = [], $moduleCo
 		];
 		$config   = array_merge($config, $defaults);
 
-		$autoload       = new \Config\Autoload();
-		$autoload->psr4 = $config;
+		Services::autoloader()->addNamespace($config);
 
-		$loader = new MockFileLocator($autoload);
-		$loader->setFiles($files);
+		$loader = Services::locator();
 
 		if ($moduleConfig === null)
 		{

tests/system/Router/RouterTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace CodeIgniter\Router;
 
-use Tests\Support\Autoloader\MockFileLocator;
+use CodeIgniter\Config\Services;
 
 class RouterTest extends \CIUnitTestCase
 {
@@ -24,7 +24,7 @@ public function setUp()
 
 		$moduleConfig          = new \Config\Modules;
 		$moduleConfig->enabled = false;
-		$this->collection      = new RouteCollection(new MockFileLocator(new \Config\Autoload()), $moduleConfig);
+		$this->collection      = new RouteCollection(Services::locator(), $moduleConfig);
 
 		$routes = [
 			'users'                                           => 'Users::index',

tests/system/View/ParserFilterTest.php

@@ -12,7 +12,8 @@ public function setUp()
 	{
 		parent::setUp();
 
-		$this->loader   = new \CodeIgniter\Autoloader\FileLocator(new \Config\Autoload());
+		$this->loader = \CodeIgniter\Config\Services::locator();
+		;
 		$this->viewsDir = __DIR__ . '/Views';
 		$this->config   = new Config\View();
 	}

tests/system/View/ParserTest.php

@@ -10,7 +10,7 @@ public function setUp()
 	{
 		parent::setUp();
 
-		$this->loader   = new \CodeIgniter\Autoloader\FileLocator(new \Config\Autoload());
+		$this->loader   = \CodeIgniter\Config\Services::locator();
 		$this->viewsDir = __DIR__ . '/Views';
 		$this->config   = new Config\View();
 	}

tests/system/View/ViewTest.php

@@ -15,7 +15,7 @@ public function setUp()
 	{
 		parent::setUp();
 
-		$this->loader   = new \CodeIgniter\Autoloader\FileLocator(new \Config\Autoload());
+		$this->loader   = \CodeIgniter\Config\Services::locator();
 		$this->viewsDir = __DIR__ . '/Views';
 		$this->config   = new Config\View();
 	}