Consolidate and fix tests

Author: MGatner

.github/workflows/test-phpunit.yml

@@ -3,8 +3,7 @@
 if (! function_exists('setting'))
 {
 	/**
-	 * Provides a convenience interface to the
-	 * Bonfire/Settings/Settings class.
+	 * Provides a convenience interface to the Settings service.
 	 *
 	 * @param string|null $field
 	 * @param null        $value

src/Helpers/setting_helper.php

@@ -11,16 +11,11 @@ class HelperTest extends TestCase
 {
 	use DatabaseTestTrait;
 
-	protected $namespace = 'Sparks\Settings';
-	protected $refresh   = true;
-	protected $table;
-
 	public function setUp(): void
 	{
 		parent::setUp();
 
-		$this->table = config('Settings')->database['table'];
-		helper('setting');
+		helper(['setting']);
 	}
 
 	public function testReturnsServiceByDefault()

tests/HelperTest.php

@@ -11,17 +11,6 @@ class SettingsTest extends TestCase
 {
 	use DatabaseTestTrait;
 
-	protected $namespace = 'Sparks\Settings';
-	protected $refresh   = true;
-	protected $table;
-
-	public function setUp(): void
-	{
-		parent::setUp();
-
-		$this->table = config('Settings')->database['table'];
-	}
-
 	public function testSettingsGetsFromConfig()
 	{
 		$settings = new Settings();

tests/SettingsTest.php

@@ -4,14 +4,27 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class TestCase extends CIUnitTestCase
+abstract class TestCase extends CIUnitTestCase
 {
+	protected $namespace = 'Sparks\Settings';
+	protected $refresh   = true;
 
+	/**
+	 * @var string
+	 */
+	protected $table;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
+	public function setUp(): void
+	{
+		parent::setUp();
 
-        $_SESSION = [];
-    }
+		$this->table = config('Settings')->database['table'];
+	}
+
+	public function tearDown(): void
+	{
+		parent::tearDown();
+
+		$this->resetServices();
+	}
 }