Fixing event test that only occurred when all tests were ran in sequence.

Author: lonnieezell

system/Events/Events.php

@@ -87,13 +87,11 @@ class Events
 
 	/**
 	 * Ensures that we have a events file ready.
-	 *
-	 * @param string|null $file
 	 */
-	public static function initialize(string $file = null)
+	public static function initialize()
 	{
 		// Don't overwrite anything....
-		if (self::$initialized)
+		if (static::$initialized)
 		{
 			return;
 		}
@@ -120,7 +118,7 @@ public static function initialize(string $file = null)
 			include $file;
 		}
 
-		self::$initialized = true;
+		static::$initialized = true;
 	}
 
 	//--------------------------------------------------------------------

tests/_support/Events/MockEvents.php

@@ -59,4 +59,8 @@ public function getSimulate()
 		return self::$simulate;
 	}
 
+	public function unInitialize()
+	{
+		static::$initialized = false;
+	}
 }

tests/system/Events/EventsTest.php

@@ -16,32 +16,29 @@ public function setUp()
 
 		$this->manager = new MockEvents();
 
+		$config = config('Modules');
+		$config->activeExplorers = [];
+		Config::injectMock('Modules', $config);
+
 		Events::removeAllListeners();
 	}
 
 	//--------------------------------------------------------------------
 
 	public function testInitialize()
 	{
-		$config = config('Modules');
-		$config->activeExplorers = [];
-		Config::injectMock('Modules', $config);
-
 		// it should start out empty
 		$default = [APPPATH . 'Config/Events.php'];
-		Events::setFiles([]);
+		$this->manager->setFiles([]);
 		$this->assertEmpty($this->manager->getFiles());
 
 		// make sure we have a default events file
-		Events::initialize();
-		$this->assertEquals($default, $this->manager->getFiles());
-
-		// and we should not be able to change it normally
-		Events::initialize('abracadabra');
+		$this->manager->unInitialize();
+		$this->manager::initialize();
 		$this->assertEquals($default, $this->manager->getFiles());
 
 		// but we should be able to change it through the backdoor
-		Events::setFiles(['/peanuts']);
+		$this->manager::setFiles(['/peanuts']);
 		$this->assertEquals(['/peanuts'], $this->manager->getFiles());
 	}