Fix supportpath; Add manifests tests

Author: MGatner

src/Libraries/Manifests.php

@@ -111,7 +111,7 @@ protected function manifestFromFile($path): ?object
 		}
 
 		// Verify necessary fields
-		foreach (['source', 'destination', 'paths'] as $field)
+		foreach (['source', 'destination', 'resources'] as $field)
 		{
 			if (empty($manifest->{$field}))
 			{
@@ -195,15 +195,15 @@ protected function addIndexToDirectory($directory): bool
 	{
 		$path = $directory . 'index.html';
 		$file = new File($path);
-		
+
 		// Check for existing file
 		if ($file->isFile())
 		{
 			return true;
 		}
 
 		// Directory should be writable but just in case...
-		if (! $file->isWritable)
+		if (! $file->isWritable())
 		{
 			$error = lang('Manifests.directoryNotWritable', [$directory]);
 			log_message('warning', $error);

tests/_support/AssetsTestCase.php

@@ -18,7 +18,7 @@ public function setUp(): void
 
 		$this->config           = new \Tatter\Assets\Config\Assets;
 		$this->config->silent   = false;
-		$this->config->fileBase = SUPPORTPATH . 'assets/';
+		$this->config->fileBase = MODULESUPPORTPATH . 'assets/';
 
 		// Create the service
 		$this->assets = new \Tatter\Assets\Libraries\Assets($this->config);

tests/_support/bootstrap.php

@@ -19,12 +19,13 @@
 define('FCPATH',        realpath(ROOTPATH . 'public') . DIRECTORY_SEPARATOR);
 define('SYSTEMPATH',    realpath($paths->systemDirectory) . DIRECTORY_SEPARATOR);
 define('WRITEPATH',     realpath($paths->writableDirectory) . DIRECTORY_SEPARATOR);
+define('SUPPORTPATH',   realpath(ROOTPATH . 'tests/_support') . DIRECTORY_SEPARATOR);
 
 // Define necessary module test path constants
-define('SUPPORTPATH',   realpath(__DIR__) . DIRECTORY_SEPARATOR);
-define('TESTPATH',      realpath(SUPPORTPATH . '../') . DIRECTORY_SEPARATOR);
-define('MODULEPATH',    realpath(__DIR__ . '/../../') . DIRECTORY_SEPARATOR);
-define('COMPOSER_PATH', MODULEPATH . 'vendor/autoload.php');
+define('MODULESUPPORTPATH', realpath(__DIR__) . DIRECTORY_SEPARATOR);
+define('TESTPATH',          realpath(MODULESUPPORTPATH . '../') . DIRECTORY_SEPARATOR);
+define('MODULEPATH',        realpath(__DIR__ . '/../../') . DIRECTORY_SEPARATOR);
+define('COMPOSER_PATH',     MODULEPATH . 'vendor/autoload.php');
 
 // Set environment values that would otherwise stop the framework from functioning during tests.
 if (! isset($_SERVER['app.baseURL']))

tests/assets/ConfigHandlerTest.php

@@ -18,7 +18,7 @@ public function setUp(): void
 
 		$this->config           = new \Tatter\Assets\Config\Assets;
 		$this->config->silent   = false;
-		$this->config->fileBase = SUPPORTPATH . 'assets/';
+		$this->config->fileBase = MODULESUPPORTPATH . 'assets/';
 
 		// Add mock route paths
 		$this->config->routes = [

tests/manifests/ManifestTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use CodeIgniter\Config\Services;
+use org\bovigo\vfs\vfsStream;
 
 class ManifestTest extends \CodeIgniter\Test\CIUnitTestCase
 {
@@ -24,17 +25,71 @@ public function setUp(): void
 
 		// Create the service
 		$this->manifests = new \Tatter\Assets\Libraries\Manifests($this->config);
+		
+		// Start the virtual filesystem
+		$this->root = vfsStream::setup();
+	}
+	
+	public function tearDown(): void
+	{
+		parent::tearDown();
+		$this->root = null;
 	}
 
 	public function testLocate()
 	{
 		$expected = [
-			SUPPORTPATH . 'Manifests/Widgets.json',
-			SUPPORTPATH . 'Manifests/frontend.json',
-			SUPPORTPATH . 'Manifests/LawyerPack.json',
+			MODULESUPPORTPATH . 'Manifests/Widgets.json',
+			MODULESUPPORTPATH . 'Manifests/frontend.json',
+			MODULESUPPORTPATH . 'Manifests/LawyerPack.json',
 		];
 		$paths = $this->manifests->locate();
 
 		$this->assertEquals($expected, $paths);
 	}
+	
+	public function testManifestFromFile()
+	{
+		$method = $this->getPrivateMethodInvoker($this->manifests, 'manifestFromFile');
+		$path = SUPPORTPATH . 'Manifests/Widgets.json';
+		
+		$manifest = $method($path);
+		
+		$expected = (object)[
+			'source'      => 'vendor/WidgetModule/dist',
+			'destination' => 'vendor/widgets',
+			'resources'   => [
+				0 => (object)[
+					'source'      => 'widget_style.css',
+					'destination' => 'vendor/widgets/css',
+				],
+				1 => (object)[
+					'source'      => 'notAsset.json',
+				],
+			]
+		];
+
+		$this->assertEquals($expected, $manifest);
+	}
+	
+	public function testAddIndexToDirectory()
+	{
+		$method = $this->getPrivateMethodInvoker($this->manifests, 'addIndexToDirectory');
+		
+		$result = $method($this->root->url() . '/');
+		$this->assertTrue($result);
+		
+		$this->assertTrue($this->root->hasChild('index.html'));
+	}
+/*
+	public function testSecureDirectory()
+	{
+		$method = $this->getPrivateMethodInvoker($this->manifests, 'addIndexToDirectory');
+		
+		$result = $method($this->root->url() . '/assets/');
+		$this->assertTrue($result);
+		
+		$this->assertTrue($this->root->hasChild('index.html'));
+		$this->assertTrue($this->root->hasChild('assets/index.html'));
+*/
 }