Merge pull request #11 from samsonasik/test-display2

Continue add more tests to DisplayTest

Author: MGatner

src/Entities/File.php

@@ -41,7 +41,7 @@ protected static function locateDefaultThumbnail(): string
 			}
 		}
 
-		return self::$defaultThumbnail;
+		return (string) self::$defaultThumbnail;
 	}
 
 	//--------------------------------------------------------------------

src/Views/Formats/cards.php

@@ -4,7 +4,7 @@
 			<div class="card-deck">
 	<?php foreach ($files as $file): ?>
 				<div class="card mb-4" style="min-width: 10rem; max-width: 200px;">
-					<img src="<?= img_data($file->thumbnail) ?>" class="card-img-top img-thumbnail" alt="<?= $file->filename ?>">
+					<img src="<?= img_data($file->getThumbnail()) ?>" class="card-img-top img-thumbnail" alt="<?= $file->filename ?>">
 					<div class="card-header">
 						<?= view('Tatter\Files\Views\Menus\single', ['file' => $file, 'access' => $access]) ?>
 					</div>

src/Views/Formats/list.php

@@ -15,7 +15,7 @@
 				<tbody>
 	<?php foreach ($files as $file): ?>
 					<tr>
-						<td><img src="<?= img_data($file->thumbnail) ?>" class="img-fluid rounded" alt="<?= $file->filename ?>" style="max-height:40px;"></td>
+						<td><img src="<?= img_data($file->getThumbnail()) ?>" class="img-fluid rounded" alt="<?= $file->filename ?>" style="max-height:40px;"></td>
 						<td class="align-middle"><?= $file->filename ?></td>
 						<td class="align-middle"><?= $file->type ?></td>
 						<td class="align-middle"><?= bytes2human($file->size) ?></td>

tests/feature/DisplayTest.php

@@ -26,6 +26,41 @@ public function testDefaultDisplaysCards()
 		$result->assertSee($file->filename);
 	}
 
+	public function testDataUsesSettings()
+	{
+		service('settings')->filesSort = 'type';
+		service('settings')->filesOrder = 'asc';
+		service('settings')->filesFormat = 'cards';
+
+		$file = fake(FileFaker::class);
+		$result = $this->get('files');
+		$result->assertStatus(200);
+		$result->assertSee($file->filename);
+	}
+
+	public function provideFormat()
+	{
+		yield ['cards', 'cards'];
+		yield ['list', 'list'];
+		yield ['select', 'select'];
+		yield ['invalid', config('Files')->defaultFormat];
+	}
+
+	/**
+	 * @dataProvider provideFormat
+	 */
+
+	public function testFormat(string $format, string $configFormat)
+	{
+		$_REQUEST['format'] = $format;
+
+		$file = fake(FileFaker::class);
+		$result = $this->get('files');
+
+		$result->assertStatus(200);
+		$this->assertEquals($configFormat, service('settings')->filesFormat);
+	}
+
 	public function provideSort()
 	{
 		yield ['filename', 'filename'];
@@ -75,6 +110,7 @@ public function testOrders(string $order, string $configOrder)
 	public function provideSearch()
 	{
 		yield ['Heathcote'];
+		yield ['will never be found'];
 	}
 
 	/**
@@ -90,9 +126,12 @@ public function testSearches(string $keyword)
 		$result->assertStatus(200);
 		$content = $result->response->getBody();
 
-		if (strpos($content, $keyword) !== false) {
+		if (strpos($content, $keyword) !== false)
+		{
 			$result->assertSee($keyword);
-		} else {
+		}
+		else
+		{
 			$result->assertSee('You have no files!');
 		}
 	}

tests/unit/ControllerTest.php

@@ -1,8 +1,11 @@
 <?php
 
 use CodeIgniter\Config\Config;
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use Tatter\Files\Controllers\Files;
+use Tatter\Files\Entities\File;
 use Tatter\Files\Exceptions\FilesException;
+use Tests\Support\Fakers\FileFaker;
 use Tests\Support\FilesTestCase;
 use Tests\Support\Models\FileModel;
 
@@ -177,4 +180,52 @@ public function testGetFormatIgnoresInvalid()
 
 		$this->assertEquals('cards', $result);
 	}
+
+	public function testDataUsesVarWithFaker()
+	{
+		$file = fake(FileFaker::class);
+
+		$controller = new Files();
+		$controller->initController(service('request'), service('response'), service('logger'));
+
+		$method = $this->getPrivateMethodInvoker($controller, 'setData');
+		$method([
+			'files' => [
+				0 => $file
+			],
+		]);
+
+		$result = $controller->display();
+		$this->assertStringContainsString($file->filename, $result);
+	}
+
+	public function testDataUsesVarViaPassEntity()
+	{
+		$controller = new Files();
+		$controller->initController(service('request'), service('response'), service('logger'));
+
+		$file = new File;
+		$file->filename ='foo.txt';
+		$file->thumbnail = '';
+		$file->type = '';
+		$file->localname = '';
+		$file->clientname = '';
+		$file->size = 1;
+		$file->created_at = new class {
+			public function humanize()
+			{
+				return '';
+			}
+		};
+
+		$method = $this->getPrivateMethodInvoker($controller, 'setData');
+		$method([
+			'files' => [
+				0 => $file
+			],
+		]);
+
+		$result = $controller->display();
+		$this->assertStringContainsString($file->filename, $result);
+	}
 }