Refactor tests to framework verison

MGatner · MGatner · commit 152b1967fe20 · 2020-07-11T17:42:20.000Z
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,6 @@
 build/
 phpunit*.xml
 phpunit
+*.cache
 composer.lock
 .DS_Store
diff --git a/README.md b/README.md
@@ -1,6 +1,9 @@
 # Tatter\Assets
+
 Lightweight asset loader for CodeIgniter 4
 
+[![](https://github.com/tattersoftware/codeigniter4-assets/workflows/PHPUnit/badge.svg)](https://github.com/tattersoftware/codeigniter4-assets/actions?query=workflow%3A%22PHPUnit)
+
 ## Quick Start
 
 1. Install with Composer: `> composer require tatter/assets`
diff --git a/composer.json b/composer.json
@@ -26,14 +26,15 @@
 		}
 	],
 	"minimum-stability": "dev",
+	"prefer-stable": true,
 	"require": {
 		"php" : ">=7.2"
 	},
 	"require-dev": {
 		"codeigniter4/codeigniter4": "dev-develop",
+		"fzaninotto/faker": "^1.9@dev",
 		"mikey179/vfsstream": "1.6.*",
-		"mockery/mockery": "^1.0",
-		"phpunit/phpunit" : "^7.0"
+		"phpunit/phpunit" : "^8.5"
 	},
 	"autoload": {
 		"psr-4": {
@@ -42,7 +43,7 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"ModuleTests\\Support\\": "tests/_support"
+			"Tests\\Support\\": "tests/_support"
 		}
 	},
 	"scripts": {
diff --git a/src/Handlers/ConfigHandler.php b/src/Handlers/ConfigHandler.php
@@ -2,6 +2,7 @@
 
 use CodeIgniter\Config\BaseConfig;
 use Config\Services;
+use Tatter\Assets\Exceptions\AssetsException;
 use Tatter\Assets\Handlers\DirectoryHandler;
 use Tatter\Assets\Interfaces\AssetHandlerInterface;
 
diff --git a/tests/_support/AssetsTestCase.php b/tests/_support/AssetsTestCase.php
@@ -1,6 +1,9 @@
-<?php namespace ModuleTests\Support;
+<?php namespace Tests\Support;
 
-class AssetsTestCase extends \CodeIgniter\Test\CIUnitTestCase
+use CodeIgniter\Test\CIUnitTestCase;
+use Tatter\Assets\Libraries\Assets;
+
+class AssetsTestCase extends CIUnitTestCase
 {
 	/**
 	 * @var \Tatter\Assets\Libraries\Assets
@@ -16,11 +19,11 @@ public function setUp(): void
     {
         parent::setUp();
 		
-		$this->config           = new \Tatter\Assets\Config\Assets;
+		$this->config           = new \Tatter\Assets\Config\Assets();
 		$this->config->silent   = false;
-		$this->config->fileBase = MODULESUPPORTPATH . 'assets/';
+		$this->config->fileBase = SUPPORTPATH . 'assets/';
 		
 		// Create the service
-		$this->assets = new \Tatter\Assets\Libraries\Assets($this->config);
+		$this->assets = new Assets($this->config);
 	}
 }
diff --git a/tests/_support/ManifestsTestCase.php b/tests/_support/ManifestsTestCase.php
@@ -1,8 +1,10 @@
-<?php namespace ModuleTests\Support;
+<?php namespace Tests\Support;
 
+use CodeIgniter\Test\CIUnitTestCase;
+use Tatter\Assets\Libraries\Manifests;
 use org\bovigo\vfs\vfsStream;
 
-class ManifestsTestCase extends \CodeIgniter\Test\CIUnitTestCase
+class ManifestsTestCase extends CIUnitTestCase
 {
 	/**
 	 * @var \Tatter\Assets\Libraries\Manifests
@@ -21,13 +23,13 @@ public function setUp(): void
 		// Start the virtual filesystem
 		$this->root = vfsStream::setup();
 		
-		$this->config              = new \Tatter\Assets\Config\Assets;
+		$this->config              = new \Tatter\Assets\Config\Assets();
 		$this->config->silent      = false;
 		$this->config->fileBase    = $this->root->url() . '/assets/';
-		$this->config->publishBase = MODULESUPPORTPATH;
+		$this->config->publishBase = SUPPORTPATH;
 		
 		// Create the service
-		$this->manifests = new \Tatter\Assets\Libraries\Manifests($this->config);
+		$this->manifests = new Manifests($this->config);
 		
 		// Create an example manifest (equivalent to Widgets.json)
 		$this->testManifest = (object)[
diff --git a/tests/_support/assets/vendor/widget/colorful.css b/tests/_support/assets/vendor/widget/colorful.css
diff --git a/tests/_support/assets/vendor/widget/forms.css b/tests/_support/assets/vendor/widget/forms.css
@@ -0,0 +1,3 @@
+body {
+	backgorund-color: black;
+}
diff --git a/tests/_support/bootstrap.php b/tests/_support/bootstrap.php
diff --git a/tests/assets/ConfigHandlerTest.php b/tests/assets/ConfigHandlerTest.php
@@ -1,6 +1,10 @@
 <?php
 
-class ConfigHandlerTest extends \CodeIgniter\Test\CIUnitTestCase
+use CodeIgniter\Test\CIUnitTestCase;
+use Tatter\Assets\Handlers\ConfigHandler;
+use Tatter\Assets\Libraries\Assets;
+
+class ConfigHandlerTest extends CIUnitTestCase
 {
 	/**
 	 * @var \Tatter\Assets\Libraries\Assets
@@ -16,9 +20,9 @@ public function setUp(): void
     {
         parent::setUp();
 		
-		$this->config           = new \Tatter\Assets\Config\Assets;
+		$this->config           = new \Tatter\Assets\Config\Assets();
 		$this->config->silent   = false;
-		$this->config->fileBase = MODULESUPPORTPATH . 'assets/';
+		$this->config->fileBase = SUPPORTPATH . 'assets/';
 		
 		// Add mock route paths
 		$this->config->routes = [
@@ -31,10 +35,10 @@ public function setUp(): void
 		];
 		
 		// Create the service
-		$this->assets = new \Tatter\Assets\Libraries\Assets($this->config);
+		$this->assets = new Assets($this->config);
 		
 		// Limit to just the ConfigHandler
-		$this->assets->setHandlers(['\Tatter\Assets\Handlers\ConfigHandler']);
+		$this->assets->setHandlers([ConfigHandler::class]);
 	}
 
 	public function testBasicRoute()
@@ -56,8 +60,8 @@ public function testRouteWithDirectory()
 		
 		$expected = [
 			'unrouted/machines.js',
-			'vendor/widget/colorful.css',
 			'vendor/widget/forms.css',
+			'vendor/widget/colorful.css',
 		];
 		
 		$paths = $this->assets->getPaths();
diff --git a/tests/assets/DirectoryHandlerTest.php b/tests/assets/DirectoryHandlerTest.php
@@ -1,22 +1,24 @@
 <?php
 
 use CodeIgniter\Config\Services;
+use Tatter\Assets\Handlers\DirectoryHandler;
+use Tests\Support\AssetsTestCase;
 
-class DirectoryHandlerTest extends \ModuleTests\Support\AssetsTestCase
+class DirectoryHandlerTest extends AssetsTestCase
 {
     public function setUp(): void
     {
         parent::setUp();
 		
 		// Limit to just the DirectoryHandler
-		$this->assets->setHandlers(['\Tatter\Assets\Handlers\DirectoryHandler']);
+		$this->assets->setHandlers([DirectoryHandler::class]);
 	}
 	
 	public function testDefaultRoute()
 	{
 		$expected = [
-			'styles.css',
 			'alert.js',
+			'styles.css',
 		];
 
 		$paths = $this->assets->getPaths();
@@ -29,8 +31,8 @@ public function testBasicRoute()
 		$this->assets->setRoute('factories/edit');
 		
 		$expected = [
-			'styles.css',
 			'alert.js',
+			'styles.css',
 			'factories/factories.css',
 			'factories/edit/validate.js',
 		];
@@ -45,8 +47,8 @@ public function testBasicRouteWithoutAssets()
 		$this->assets->setRoute('workers/index');
 		
 		$expected = [
-			'styles.css',
 			'alert.js',
+			'styles.css',
 		];
 
 		$paths = $this->assets->getPaths();
@@ -59,8 +61,8 @@ public function testBasicRouteWithImplictAssets()
 		$this->assets->setRoute('factories');
 		
 		$expected = [
-			'styles.css',
 			'alert.js',
+			'styles.css',
 			'factories/factories.css',
 			'factories/index/factoriesDataTable.js',
 		];
diff --git a/tests/assets/RouteTest.php b/tests/assets/RouteTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use CodeIgniter\Config\Services;
+use Tests\Support\AssetsTestCase;
 
-class RouteTest extends \ModuleTests\Support\AssetsTestCase
+class RouteTest extends AssetsTestCase
 {
 	public function testGetRouteDefault()
 	{
diff --git a/tests/manifests/MethodsTest.php b/tests/manifests/MethodsTest.php
@@ -3,16 +3,18 @@
 use CodeIgniter\Files\Exceptions\FileException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use Tatter\Assets\Exceptions\ManifestsException;
+use Tatter\Assets\Libraries\Manifests;
+use Tests\Support\ManifestsTestCase;
 use org\bovigo\vfs\vfsStream;
 
-class MethodsTest extends \ModuleTests\Support\ManifestsTestCase
+class MethodsTest extends ManifestsTestCase
 {	
 	public function testLocate()
 	{
 		$expected = [
-			MODULESUPPORTPATH . 'Manifests/Widgets.json',
-			MODULESUPPORTPATH . 'Manifests/frontend.json',
-			MODULESUPPORTPATH . 'Manifests/LawyerPack.json',
+			SUPPORTPATH . 'Manifests/LawyerPack.json',
+			SUPPORTPATH . 'Manifests/Widgets.json',
+			SUPPORTPATH . 'Manifests/frontend.json',
 		];
 		$paths = $this->manifests->locate();
 
@@ -21,7 +23,7 @@ public function testLocate()
 	
 	public function testParse()
 	{
-		$path = MODULESUPPORTPATH . 'Manifests/Widgets.json';
+		$path = SUPPORTPATH . 'Manifests/Widgets.json';
 		
 		$manifest = $this->manifests->parse($path);
 
@@ -160,7 +162,7 @@ public function testGetMessages()
 	{
 		// Get a new version the library that is silent
 		$this->config->silent = true;
-		$manifests = new \Tatter\Assets\Libraries\Manifests($this->config);
+		$manifests = new Manifests($this->config);
 		
 		$expected = [
 			[lang('Files.fileNotFound', ['missing.json']), 'red']
diff --git a/tests/manifests/PublishTest.php b/tests/manifests/PublishTest.php
@@ -3,10 +3,11 @@
 use CodeIgniter\Files\Exceptions\FileException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use Tatter\Assets\Exceptions\ManifestsException;
+use Tests\Support\ManifestsTestCase;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
 
-class PublishTest extends \ModuleTests\Support\ManifestsTestCase
+class PublishTest extends ManifestsTestCase
 {
 	public function testExplicitFiles()
 	{
@@ -40,7 +41,7 @@ public function testExplicitFiles()
 	
 	public function testRecursiveFlatten()
 	{
-		$path     = MODULESUPPORTPATH . 'Manifests/frontend.json';
+		$path     = SUPPORTPATH . 'Manifests/frontend.json';
 		$manifest = $this->manifests->parse($path);
 		$result   = $this->manifests->publish($manifest);
 
@@ -57,7 +58,7 @@ public function testRecursiveFlatten()
 	
 	public function testRespectsFilters()
 	{
-		$path     = MODULESUPPORTPATH . 'Manifests/LawyerPack.json';
+		$path     = SUPPORTPATH . 'Manifests/LawyerPack.json';
 		$manifest = $this->manifests->parse($path);
 		$result   = $this->manifests->publish($manifest);
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`		`-<?php namespace ModuleTests\Support;`
	`1`	`+<?php namespace Tests\Support;`
`2`	`2`
`3`		`-class AssetsTestCase extends \CodeIgniter\Test\CIUnitTestCase`
	`3`	`+use CodeIgniter\Test\CIUnitTestCase;`
	`4`	`+use Tatter\Assets\Libraries\Assets;`
	`5`	`+`
	`6`	`+class AssetsTestCase extends CIUnitTestCase`
`4`	`7`	`{`
`5`	`8`	`/**`
`6`	`9`	`* @var \Tatter\Assets\Libraries\Assets`
`@@ -16,11 +19,11 @@ public function setUp(): void`
`16`	`19`	`{`
`17`	`20`	`parent::setUp();`
`18`	`21`
`19`		`- $this->config = new \Tatter\Assets\Config\Assets;`
	`22`	`+ $this->config = new \Tatter\Assets\Config\Assets();`
`20`	`23`	`$this->config->silent = false;`
`21`		`- $this->config->fileBase = MODULESUPPORTPATH . 'assets/';`
	`24`	`+ $this->config->fileBase = SUPPORTPATH . 'assets/';`
`22`	`25`
`23`	`26`	`// Create the service`
`24`		`- $this->assets = new \Tatter\Assets\Libraries\Assets($this->config);`
	`27`	`+ $this->assets = new Assets($this->config);`
`25`	`28`	`}`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+body {`
	`2`	`+ backgorund-color: black;`
	`3`	`+}`