Fix up tests

Author: lonnieezell

system/Config/BaseConfig.php

@@ -54,7 +54,7 @@ class BaseConfig
 	 *
 	 * @var array
 	 */
-	protected static $registrars = [];
+	public static $registrars = [];
 
 	protected static $didDiscovery = false;
 
@@ -126,7 +126,10 @@ public function __construct()
 			}
 		}
 
-		$this->registerProperties();
+		if (ENVIRONMENT != 'testing')
+		{
+			$this->registerProperties();
+		}
 	}
 
 	//--------------------------------------------------------------------

system/Config/Config.php

@@ -84,6 +84,19 @@ public static function get(string $name, bool $getShared = true)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Helper method for injecting mock instances while testing.
+	 *
+	 * @param string $class
+	 * @param        $instance
+	 */
+	public static function injectMock(string $class, $instance)
+	{
+		self::$instances[$class] = $instance;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Find configuration class and create instance
 	 *

system/Events/Events.php

@@ -77,6 +77,12 @@ class Events
 	 */
 	protected static $performanceLog = [];
 
+	/**
+	 * A list of found files.
+	 * @var array
+	 */
+	protected static $files = [];
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -94,16 +100,17 @@ public static function initialize(string $file = null)
 
 		$config = config('Modules');
 
-		if (! $config->shouldDiscover('events'))
+		$files = [APPPATH.'Config/Events.php'];
+
+		if ($config->shouldDiscover('events'))
 		{
-			return;
+			$locator = Services::locator();
+			$files = $locator->search('Config/Events.php');
 		}
 
-		$locator = Services::locator();
+		static::$files = $files;
 
-		$files = $locator->search('Config/Events.php');
-
-		foreach ($files as $file)
+		foreach (static::$files as $file)
 		{
 			if (! file_exists($file))
 			{
@@ -292,11 +299,23 @@ public static function removeAllListeners($event_name = null)
 	/**
 	 * Sets the path to the file that routes are read from.
 	 *
-	 * @param string $path
+	 * @param array $files
+	 */
+	public static function setFiles(array $files)
+	{
+		static::$files = $files;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the files that were found/loaded during this request.
+	 *
+	 * @return mixed
 	 */
-	public static function setFile(string $path)
+	public function getFiles()
 	{
-		self::$eventsFile = $path;
+		return static::$files;
 	}
 
 	//--------------------------------------------------------------------

tests/_support/Config/WorseRegistrar.php

@@ -125,7 +125,7 @@ public function testRun404OverrideByClosure()
 		$_SERVER['argc'] = 2;
 
 		// Inject mock router.
-		$routes = new RouteCollection(new MockFileLocator(new \Config\Autoload()));
+		$routes = new RouteCollection(new MockFileLocator(new \Config\Autoload()), new \Config\Modules());
 		$routes->setAutoRoute(false);
 		$routes->set404Override(function() {
 			echo '404 Override by Closure.';

tests/system/CodeIgniterTest.php

@@ -102,7 +102,7 @@ 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()));
+		$routes = new \CodeIgniter\Router\RouteCollection(new \Tests\Support\Autoloader\MockFileLocator(new \Config\Autoload()), 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()));
+		$this->routes = new RouteCollection(new MockFileLocator(new Autoload()), new \Config\Modules());
 		Services::injectMock('routes', $this->routes);
 
 		$this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());

tests/system/CommonFunctionsTest.php

@@ -23,14 +23,6 @@ public function setup()
 		{
 			require $this->fixturesFolder . '/RegistrarConfig.php';
 		}
-		if ( ! class_exists('RegistrarConfig2', false))
-		{
-			require $this->fixturesFolder . '/RegistrarConfig2.php';
-		}
-		if ( ! class_exists('RegistrarConfig3', false))
-		{
-			require $this->fixturesFolder . '/RegistrarConfig3.php';
-		}
 	}
 
 	//--------------------------------------------------------------------
@@ -147,6 +139,10 @@ public function testRecognizesLooseValues()
 	public function testRegistrars()
 	{
 		$config = new \RegistrarConfig();
+		$config::$registrars = ['\Tests\Support\Config\Registrar'];
+		$this->setPrivateProperty($config, 'didDiscovery', true);
+		$method = $this->getPrivateMethodInvoker($config, 'registerProperties');
+		$method();
 
 		// no change to unmodified property
 		$this->assertEquals('bar', $config->foo);
@@ -160,16 +156,13 @@ public function testRegistrars()
 
 	public function testBadRegistrar()
 	{
-		$this->expectException('RuntimeException');
-		$config = new \RegistrarConfig2();
-		$this->assertEquals('bar', $config->foo);
-	}
+		// Shouldn't change any values.
+		$config = new \RegistrarConfig();
+		$config::$registrars = ['\Tests\Support\Config\BadRegistrar'];
+		$this->setPrivateProperty($config, 'didDiscovery', true);
+		$method = $this->getPrivateMethodInvoker($config, 'registerProperties');
+		$method();
 
-	// not very interesting, but useful for code coverage
-	public function testWorseRegistrar()
-	{
-		$config = new \RegistrarConfig3();
-		// there should be no change
 		$this->assertEquals('bar', $config->foo);
 	}
 

tests/system/Config/BaseConfigTest.php

@@ -7,7 +7,4 @@ class RegistrarConfig extends \CodeIgniter\Config\BaseConfig
 		'baz'
 	];
 
-	protected $registrars = [
-		\Tests\Support\Config\Registrar::class
-	];
 }