From b39007c0835b38c8c2183bc483e81a678223007c Mon Sep 17 00:00:00 2001
From: Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Date: Mon, 6 Jan 2020 14:32:48 -0700
Subject: [PATCH] Updated tests due to the application structure refactor

---
 app/Controllers/DirectoryController.php       |  6 ++-
 app/Controllers/FileInfoController.php        | 12 +++++-
 tests/Bootstrap/AppManangerTest.php           | 19 +++++++++
 .../Controllers/DirectoryControllerTest.php   | 40 +++++++++++++++----
 .../Controllers/FileInfoControllerTest.php    | 12 +++---
 .../ConfigProviderTest.php}                   |  8 ++--
 .../FinderProviderTest.php}                   | 25 +++++++-----
 .../TwigProviderTest.php}                     | 10 ++---
 .../SortMethods/AccessedTest.php              |  4 +-
 .../SortMethods/ChangedTest.php               |  4 +-
 .../SortMethods/ModifiedTest.php              |  4 +-
 .../Bootstrap => }/SortMethods/NameTest.php   |  4 +-
 .../SortMethods/NaturalTest.php               |  4 +-
 .../Bootstrap => }/SortMethods/TypeTest.php   |  4 +-
 tests/{Unit => }/Support/HelpersTest.php      |  2 +-
 tests/TestCase.php                            | 14 ++++++-
 .../ViewFunctions/AssetTest.php               |  4 +-
 .../ViewFunctions/ConfigTest.php              |  4 +-
 .../Bootstrap => }/ViewFunctions/IconTest.php |  4 +-
 .../ViewFunctions/SizeForHumansTest.php       |  4 +-
 tests/{files => _files}/alpha.scss            |  0
 tests/{files => _files}/bravo.js              |  0
 tests/{files => _files}/charlie.bash          |  0
 tests/{files => _files}/delta.html            |  0
 tests/{files => _files}/echo.yaml             |  0
 tests/{files => _files}/index.php             |  0
 tests/_files/subdir/foxtrot.json              |  3 ++
 tests/_files/subdir/golf.txt                  |  1 +
 tests/_files/subdir/hotel.md                  |  2 +
 29 files changed, 137 insertions(+), 57 deletions(-)
 create mode 100644 tests/Bootstrap/AppManangerTest.php
 rename tests/{Unit => }/Controllers/DirectoryControllerTest.php (64%)
 rename tests/{Unit => }/Controllers/FileInfoControllerTest.php (71%)
 rename tests/{Unit/Bootstrap/ConfigComposerTest.php => Providers/ConfigProviderTest.php} (71%)
 rename tests/{Unit/Bootstrap/FinderComposerTest.php => Providers/FinderProviderTest.php} (77%)
 rename tests/{Unit/Bootstrap/ViewComposerTest.php => Providers/TwigProviderTest.php} (83%)
 rename tests/{Unit/Bootstrap => }/SortMethods/AccessedTest.php (80%)
 rename tests/{Unit/Bootstrap => }/SortMethods/ChangedTest.php (80%)
 rename tests/{Unit/Bootstrap => }/SortMethods/ModifiedTest.php (80%)
 rename tests/{Unit/Bootstrap => }/SortMethods/NameTest.php (80%)
 rename tests/{Unit/Bootstrap => }/SortMethods/NaturalTest.php (81%)
 rename tests/{Unit/Bootstrap => }/SortMethods/TypeTest.php (80%)
 rename tests/{Unit => }/Support/HelpersTest.php (97%)
 rename tests/{Unit/Bootstrap => }/ViewFunctions/AssetTest.php (78%)
 rename tests/{Unit/Bootstrap => }/ViewFunctions/ConfigTest.php (90%)
 rename tests/{Unit/Bootstrap => }/ViewFunctions/IconTest.php (94%)
 rename tests/{Unit/Bootstrap => }/ViewFunctions/SizeForHumansTest.php (96%)
 rename tests/{files => _files}/alpha.scss (100%)
 rename tests/{files => _files}/bravo.js (100%)
 rename tests/{files => _files}/charlie.bash (100%)
 rename tests/{files => _files}/delta.html (100%)
 rename tests/{files => _files}/echo.yaml (100%)
 rename tests/{files => _files}/index.php (100%)
 create mode 100644 tests/_files/subdir/foxtrot.json
 create mode 100644 tests/_files/subdir/golf.txt
 create mode 100644 tests/_files/subdir/hotel.md

diff --git a/app/Controllers/DirectoryController.php b/app/Controllers/DirectoryController.php
index 5f94ac5..c63105c 100644
--- a/app/Controllers/DirectoryController.php
+++ b/app/Controllers/DirectoryController.php
@@ -60,6 +60,8 @@ class DirectoryController
         Response $response,
         string $path = '.'
     ) {
+        $path = realpath($this->container->get('base_path') . '/' . $path);
+
         try {
             $files = $files->in($path);
         } catch (DirectoryNotFoundException $exception) {
@@ -100,7 +102,9 @@ class DirectoryController
      */
     protected function breadcrumbs(string $path): array
     {
-        $breadcrumbs = Collection::make(array_filter(explode('/', $path)));
+        $breadcrumbs = Collection::make(explode('/', $path))->diff(
+            explode('/', $this->container->get('base_path'))
+        )->filter();
 
         return $breadcrumbs->filter(function (string $crumb) {
             return $crumb !== '.';
diff --git a/app/Controllers/FileInfoController.php b/app/Controllers/FileInfoController.php
index b64566d..9bc1727 100644
--- a/app/Controllers/FileInfoController.php
+++ b/app/Controllers/FileInfoController.php
@@ -2,22 +2,28 @@
 
 namespace App\Controllers;
 
+use DI\Container;
 use PHLAK\Config\Config;
 use Slim\Psr7\Response;
 use SplFileInfo;
 
 class FileInfoController
 {
+    /** @var Container The application container */
+    protected $container;
+
     /** @var Config App configuration component */
     protected $config;
 
     /**
      * Create a new FileInfoController object.
      *
+     * @param \DI\Container        $container
      * @param \PHLAK\Config\Config $config
      */
-    public function __construct(Config $config)
+    public function __construct(Container $container, Config $config)
     {
+        $this->container = $container;
         $this->config = $config;
     }
 
@@ -29,7 +35,9 @@ class FileInfoController
      */
     public function __invoke(Response $response, string $path = '.')
     {
-        $file = new SplFileInfo($path);
+        $file = new SplFileInfo(
+            realpath($this->container->get('base_path') . '/' . $path)
+        );
 
         if (! $file->isFile()) {
             return $response->withStatus(404, 'File not found');
diff --git a/tests/Bootstrap/AppManangerTest.php b/tests/Bootstrap/AppManangerTest.php
new file mode 100644
index 0000000..8c60d1e
--- /dev/null
+++ b/tests/Bootstrap/AppManangerTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Bootstrap;
+
+use App\Bootstrap\AppManager;
+use Invoker\CallableResolver;
+use Slim\App;
+use Tests\TestCase;
+
+class AppManangerTest extends TestCase
+{
+    public function test_it_returns_an_app_instance()
+    {
+        $callableResolver = $this->container->get(CallableResolver::class);
+        $app = (new AppManager($this->container, $this->config, $callableResolver))();
+
+        $this->assertInstanceOf(App::class, $app);
+    }
+}
diff --git a/tests/Unit/Controllers/DirectoryControllerTest.php b/tests/Controllers/DirectoryControllerTest.php
similarity index 64%
rename from tests/Unit/Controllers/DirectoryControllerTest.php
rename to tests/Controllers/DirectoryControllerTest.php
index ef25e6c..6722a1f 100644
--- a/tests/Unit/Controllers/DirectoryControllerTest.php
+++ b/tests/Controllers/DirectoryControllerTest.php
@@ -2,8 +2,9 @@
 
 namespace Tests\Controllers;
 
-use App\Bootstrap\ViewComposer;
 use App\Controllers\DirectoryController;
+use App\Providers\TwigProvider;
+use Parsedown;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Psr7\Request;
 use Slim\Psr7\Response;
@@ -13,13 +14,35 @@ use Tests\TestCase;
 
 class DirectoryControllerTest extends TestCase
 {
-    public function test_it_returns_a_response(): void
+    public function test_it_returns_a_successful_response(): void
     {
-        $this->container->call(ViewComposer::class);
+        $this->container->call(TwigProvider::class);
 
         $controller = new DirectoryController(
             $this->container,
             $this->config,
+            new Parsedown(),
+            $this->container->get(Twig::class)
+        );
+
+        $response = $controller(
+            new Finder(),
+            $this->createMock(Request::class),
+            new Response()
+        );
+
+        $this->assertInstanceOf(ResponseInterface::class, $response);
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    public function test_it_returns_a_successful_response_when_listing_a_subdirectory(): void
+    {
+        $this->container->call(TwigProvider::class);
+
+        $controller = new DirectoryController(
+            $this->container,
+            $this->config,
+            new Parsedown(),
             $this->container->get(Twig::class)
         );
 
@@ -27,7 +50,7 @@ class DirectoryControllerTest extends TestCase
             new Finder(),
             $this->createMock(Request::class),
             new Response(),
-            'tests/files'
+            'subdir'
         );
 
         $this->assertInstanceOf(ResponseInterface::class, $response);
@@ -36,11 +59,12 @@ class DirectoryControllerTest extends TestCase
 
     public function test_it_returns_a_404_error_when_not_found()
     {
-        $this->container->call(ViewComposer::class);
+        $this->container->call(TwigProvider::class);
 
         $controller = new DirectoryController(
             $this->container,
             $this->config,
+            new Parsedown(),
             $this->container->get(Twig::class)
         );
 
@@ -57,11 +81,12 @@ class DirectoryControllerTest extends TestCase
 
     public function test_it_returns_a_successful_response_for_a_search()
     {
-        $this->container->call(ViewComposer::class);
+        $this->container->call(TwigProvider::class);
 
         $controller = new DirectoryController(
             $this->container,
             $this->config,
+            new Parsedown(),
             $this->container->get(Twig::class)
         );
 
@@ -73,8 +98,7 @@ class DirectoryControllerTest extends TestCase
         $response = $controller(
             new Finder(),
             $request,
-            new Response(),
-            'tests/files'
+            new Response()
         );
 
         $this->assertInstanceOf(ResponseInterface::class, $response);
diff --git a/tests/Unit/Controllers/FileInfoControllerTest.php b/tests/Controllers/FileInfoControllerTest.php
similarity index 71%
rename from tests/Unit/Controllers/FileInfoControllerTest.php
rename to tests/Controllers/FileInfoControllerTest.php
index 1e2f23e..7face63 100644
--- a/tests/Unit/Controllers/FileInfoControllerTest.php
+++ b/tests/Controllers/FileInfoControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Controllers;
+namespace Tests\Controllers;
 
 use App\Controllers\FileInfoController;
 use Psr\Http\Message\ResponseInterface;
@@ -11,9 +11,9 @@ class FileInfoControllerTest extends TestCase
 {
     public function test_it_can_return_a_successful_response(): void
     {
-        $controller = new FileInfoController($this->config);
+        $controller = new FileInfoController($this->container, $this->config);
 
-        $response = $controller(new Response(), __DIR__ . '/../../files/alpha.scss');
+        $response = $controller(new Response(), 'alpha.scss');
 
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertEquals(200, $response->getStatusCode());
@@ -21,7 +21,7 @@ class FileInfoControllerTest extends TestCase
 
     public function test_it_can_return_a_not_found_response(): void
     {
-        $controller = new FileInfoController($this->config);
+        $controller = new FileInfoController($this->container, $this->config);
 
         $response = $controller(new Response(), 'not_a_file.test');
 
@@ -32,9 +32,9 @@ class FileInfoControllerTest extends TestCase
     public function test_it_returns_an_error_when_file_size_is_too_large(): void
     {
         $this->config->set('app.max_hash_size', 10);
-        $controller = new FileInfoController($this->config);
+        $controller = new FileInfoController($this->container, $this->config);
 
-        $response = $controller(new Response(), __DIR__ . '/../../files/alpha.scss');
+        $response = $controller(new Response(), 'alpha.scss');
 
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertEquals(500, $response->getStatusCode());
diff --git a/tests/Unit/Bootstrap/ConfigComposerTest.php b/tests/Providers/ConfigProviderTest.php
similarity index 71%
rename from tests/Unit/Bootstrap/ConfigComposerTest.php
rename to tests/Providers/ConfigProviderTest.php
index 3ef2ca4..02db312 100644
--- a/tests/Unit/Bootstrap/ConfigComposerTest.php
+++ b/tests/Providers/ConfigProviderTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Tests\Unit\Bootstrap;
+namespace Tests\Providers;
 
-use App\Bootstrap\ConfigComposer;
+use App\Providers\ConfigProvider;
 use PHLAK\Config\Config;
 use Tests\TestCase;
 
-class ConfigComposerTest extends TestCase
+class ConfigProviderTest extends TestCase
 {
     public function test_it_can_compose_the_config_component(): void
     {
-        (new ConfigComposer($this->container))();
+        (new ConfigProvider($this->container))();
 
         $config = $this->container->get(Config::class);
 
diff --git a/tests/Unit/Bootstrap/FinderComposerTest.php b/tests/Providers/FinderProviderTest.php
similarity index 77%
rename from tests/Unit/Bootstrap/FinderComposerTest.php
rename to tests/Providers/FinderProviderTest.php
index 2608364..35bc5cb 100644
--- a/tests/Unit/Bootstrap/FinderComposerTest.php
+++ b/tests/Providers/FinderProviderTest.php
@@ -1,26 +1,31 @@
 <?php
 
-namespace Tests\Unit\Bootstrap;
+namespace Tests\Providers;
 
-use App\Bootstrap\FinderProvider;
+use App\Providers\FinderProvider;
 use RuntimeException;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 use Tests\TestCase;
 
-class FinderComposerTest extends TestCase
+class FinderProviderTest extends TestCase
 {
     public function test_it_can_compose_the_finder_component(): void
     {
         (new FinderProvider($this->container, $this->config))();
 
         $finder = $this->container->get(Finder::class);
-        $finder->in($this->container->get('base_path'));
+        $finder->in($this->container->get('base_path'))->depth(0);
 
         $this->assertInstanceOf(Finder::class, $finder);
-        foreach ($finder as $file) {
-            $this->assertInstanceOf(SplFileInfo::class, $file);
-        }
+        $this->assertEquals([
+            'subdir',
+            'alpha.scss',
+            'bravo.js',
+            'charlie.bash',
+            'delta.html',
+            'echo.yaml',
+        ], $this->getFilesArray($finder));
     }
 
     public function test_it_can_sort_by_a_user_provided_closure(): void
@@ -32,7 +37,7 @@ class FinderComposerTest extends TestCase
         (new FinderProvider($this->container, $this->config))();
 
         $finder = $this->container->get(Finder::class);
-        $finder->in($this->container->get('base_path'));
+        $finder->in($this->container->get('base_path'))->depth(0);
 
         $this->assertEquals([
             'alpha.scss',
@@ -40,6 +45,7 @@ class FinderComposerTest extends TestCase
             'echo.yaml',
             'charlie.bash',
             'delta.html',
+            'subdir',
         ], $this->getFilesArray($finder));
     }
 
@@ -50,7 +56,7 @@ class FinderComposerTest extends TestCase
         (new FinderProvider($this->container, $this->config))();
 
         $finder = $this->container->get(Finder::class);
-        $finder->in($this->container->get('base_path'));
+        $finder->in($this->container->get('base_path'))->depth(0);
 
         $this->assertEquals([
             'echo.yaml',
@@ -58,6 +64,7 @@ class FinderComposerTest extends TestCase
             'charlie.bash',
             'bravo.js',
             'alpha.scss',
+            'subdir',
         ], $this->getFilesArray($finder));
     }
 
diff --git a/tests/Unit/Bootstrap/ViewComposerTest.php b/tests/Providers/TwigProviderTest.php
similarity index 83%
rename from tests/Unit/Bootstrap/ViewComposerTest.php
rename to tests/Providers/TwigProviderTest.php
index 0c496ba..44c4e6f 100644
--- a/tests/Unit/Bootstrap/ViewComposerTest.php
+++ b/tests/Providers/TwigProviderTest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Tests\Unit\Bootstrap;
+namespace Tests\Providers;
 
-use App\Bootstrap\ViewComposer;
-use App\Bootstrap\ViewFunctions;
+use App\Providers\TwigProvider;
+use App\ViewFunctions;
 use PHLAK\Config\Config;
 use Slim\Views\Twig;
 use Tests\TestCase;
 
-class ViewComposerTest extends TestCase
+class TwigProviderTest extends TestCase
 {
     public function test_it_can_compose_the_view_component(): void
     {
-        (new ViewComposer($this->container, new Config))();
+        (new TwigProvider($this->container, new Config))();
 
         $twig = $this->container->get(Twig::class);
 
diff --git a/tests/Unit/Bootstrap/SortMethods/AccessedTest.php b/tests/SortMethods/AccessedTest.php
similarity index 80%
rename from tests/Unit/Bootstrap/SortMethods/AccessedTest.php
rename to tests/SortMethods/AccessedTest.php
index c55deee..fdb5936 100644
--- a/tests/Unit/Bootstrap/SortMethods/AccessedTest.php
+++ b/tests/SortMethods/AccessedTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\SortMethods;
+namespace Tests\SortMethods;
 
-use App\Bootstrap\SortMethods\Accessed;
+use App\SortMethods\Accessed;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 
diff --git a/tests/Unit/Bootstrap/SortMethods/ChangedTest.php b/tests/SortMethods/ChangedTest.php
similarity index 80%
rename from tests/Unit/Bootstrap/SortMethods/ChangedTest.php
rename to tests/SortMethods/ChangedTest.php
index 882a3e6..d3ab111 100644
--- a/tests/Unit/Bootstrap/SortMethods/ChangedTest.php
+++ b/tests/SortMethods/ChangedTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\SortMethods;
+namespace Tests\SortMethods;
 
-use App\Bootstrap\SortMethods\Changed;
+use App\SortMethods\Changed;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 
diff --git a/tests/Unit/Bootstrap/SortMethods/ModifiedTest.php b/tests/SortMethods/ModifiedTest.php
similarity index 80%
rename from tests/Unit/Bootstrap/SortMethods/ModifiedTest.php
rename to tests/SortMethods/ModifiedTest.php
index 8211df4..37bf0ce 100644
--- a/tests/Unit/Bootstrap/SortMethods/ModifiedTest.php
+++ b/tests/SortMethods/ModifiedTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\SortMethods;
+namespace Tests\SortMethods;
 
-use App\Bootstrap\SortMethods\Modified;
+use App\SortMethods\Modified;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 
diff --git a/tests/Unit/Bootstrap/SortMethods/NameTest.php b/tests/SortMethods/NameTest.php
similarity index 80%
rename from tests/Unit/Bootstrap/SortMethods/NameTest.php
rename to tests/SortMethods/NameTest.php
index 3a0a21c..32d8340 100644
--- a/tests/Unit/Bootstrap/SortMethods/NameTest.php
+++ b/tests/SortMethods/NameTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\SortMethods;
+namespace Tests\SortMethods;
 
-use App\Bootstrap\SortMethods\Name;
+use App\SortMethods\Name;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 
diff --git a/tests/Unit/Bootstrap/SortMethods/NaturalTest.php b/tests/SortMethods/NaturalTest.php
similarity index 81%
rename from tests/Unit/Bootstrap/SortMethods/NaturalTest.php
rename to tests/SortMethods/NaturalTest.php
index 728832a..6f2e176 100644
--- a/tests/Unit/Bootstrap/SortMethods/NaturalTest.php
+++ b/tests/SortMethods/NaturalTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\SortMethods;
+namespace Tests\SortMethods;
 
-use App\Bootstrap\SortMethods\Natural;
+use App\SortMethods\Natural;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 
diff --git a/tests/Unit/Bootstrap/SortMethods/TypeTest.php b/tests/SortMethods/TypeTest.php
similarity index 80%
rename from tests/Unit/Bootstrap/SortMethods/TypeTest.php
rename to tests/SortMethods/TypeTest.php
index f6ac53e..872eafc 100644
--- a/tests/Unit/Bootstrap/SortMethods/TypeTest.php
+++ b/tests/SortMethods/TypeTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\SortMethods;
+namespace Tests\SortMethods;
 
-use App\Bootstrap\SortMethods\Type;
+use App\SortMethods\Type;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\Finder;
 
diff --git a/tests/Unit/Support/HelpersTest.php b/tests/Support/HelpersTest.php
similarity index 97%
rename from tests/Unit/Support/HelpersTest.php
rename to tests/Support/HelpersTest.php
index a3ae2ec..8901dee 100644
--- a/tests/Unit/Support/HelpersTest.php
+++ b/tests/Support/HelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Support;
+namespace Tests\Support;
 
 use App\Support\Helpers;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index a6ae71f..ca520a5 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -15,7 +15,7 @@ class TestCase extends PHPUnitTestCase
     protected $config;
 
     /** @var string Path to test files directory */
-    protected $testFilesPath = __DIR__ . '/files';
+    protected $testFilesPath = __DIR__ . '/_files';
 
     /**
      * This method is called before each test.
@@ -41,4 +41,16 @@ class TestCase extends PHPUnitTestCase
             ],
         ]);
     }
+
+    /**
+     * Get the file path to a test file.
+     *
+     * @param string $filePath
+     *
+     * @return string
+     */
+    protected function filePath(string $filePath): string
+    {
+        return realpath($this->testFilesPath . '/' . $filePath);
+    }
 }
diff --git a/tests/Unit/Bootstrap/ViewFunctions/AssetTest.php b/tests/ViewFunctions/AssetTest.php
similarity index 78%
rename from tests/Unit/Bootstrap/ViewFunctions/AssetTest.php
rename to tests/ViewFunctions/AssetTest.php
index 41d9099..35cde64 100644
--- a/tests/Unit/Bootstrap/ViewFunctions/AssetTest.php
+++ b/tests/ViewFunctions/AssetTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\ViewFunctions;
+namespace Tests\ViewFunctions;
 
-use App\Bootstrap\ViewFunctions\Asset;
+use App\ViewFunctions\Asset;
 use PHLAK\Config\Config;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Bootstrap/ViewFunctions/ConfigTest.php b/tests/ViewFunctions/ConfigTest.php
similarity index 90%
rename from tests/Unit/Bootstrap/ViewFunctions/ConfigTest.php
rename to tests/ViewFunctions/ConfigTest.php
index 9d6dc42..9d38169 100644
--- a/tests/Unit/Bootstrap/ViewFunctions/ConfigTest.php
+++ b/tests/ViewFunctions/ConfigTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\ViewFunctions;
+namespace Tests\ViewFunctions;
 
-use App\Bootstrap\ViewFunctions\Config;
+use App\ViewFunctions\Config;
 use PHLAK\Config\Config as AppConfig;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Bootstrap/ViewFunctions/IconTest.php b/tests/ViewFunctions/IconTest.php
similarity index 94%
rename from tests/Unit/Bootstrap/ViewFunctions/IconTest.php
rename to tests/ViewFunctions/IconTest.php
index c326484..82ed9ba 100644
--- a/tests/Unit/Bootstrap/ViewFunctions/IconTest.php
+++ b/tests/ViewFunctions/IconTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\ViewFunctions;
+namespace Tests\ViewFunctions;
 
-use App\Bootstrap\ViewFunctions\Icon;
+use App\ViewFunctions\Icon;
 use PHLAK\Config\Config;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\SplFileInfo;
diff --git a/tests/Unit/Bootstrap/ViewFunctions/SizeForHumansTest.php b/tests/ViewFunctions/SizeForHumansTest.php
similarity index 96%
rename from tests/Unit/Bootstrap/ViewFunctions/SizeForHumansTest.php
rename to tests/ViewFunctions/SizeForHumansTest.php
index 8ab4920..30e3895 100644
--- a/tests/Unit/Bootstrap/ViewFunctions/SizeForHumansTest.php
+++ b/tests/ViewFunctions/SizeForHumansTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\Unit\Bootstrap\ViewFunctions;
+namespace Tests\ViewFunctions;
 
-use App\Bootstrap\ViewFunctions\SizeForHumans;
+use App\ViewFunctions\SizeForHumans;
 use PHLAK\Config\Config;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Finder\SplFileInfo;
diff --git a/tests/files/alpha.scss b/tests/_files/alpha.scss
similarity index 100%
rename from tests/files/alpha.scss
rename to tests/_files/alpha.scss
diff --git a/tests/files/bravo.js b/tests/_files/bravo.js
similarity index 100%
rename from tests/files/bravo.js
rename to tests/_files/bravo.js
diff --git a/tests/files/charlie.bash b/tests/_files/charlie.bash
similarity index 100%
rename from tests/files/charlie.bash
rename to tests/_files/charlie.bash
diff --git a/tests/files/delta.html b/tests/_files/delta.html
similarity index 100%
rename from tests/files/delta.html
rename to tests/_files/delta.html
diff --git a/tests/files/echo.yaml b/tests/_files/echo.yaml
similarity index 100%
rename from tests/files/echo.yaml
rename to tests/_files/echo.yaml
diff --git a/tests/files/index.php b/tests/_files/index.php
similarity index 100%
rename from tests/files/index.php
rename to tests/_files/index.php
diff --git a/tests/_files/subdir/foxtrot.json b/tests/_files/subdir/foxtrot.json
new file mode 100644
index 0000000..f2ad770
--- /dev/null
+++ b/tests/_files/subdir/foxtrot.json
@@ -0,0 +1,3 @@
+{
+    "contents": "Test file; please ignore"
+}
diff --git a/tests/_files/subdir/golf.txt b/tests/_files/subdir/golf.txt
new file mode 100644
index 0000000..702d559
--- /dev/null
+++ b/tests/_files/subdir/golf.txt
@@ -0,0 +1 @@
+Test file; please ignore
diff --git a/tests/_files/subdir/hotel.md b/tests/_files/subdir/hotel.md
new file mode 100644
index 0000000..a9589c3
--- /dev/null
+++ b/tests/_files/subdir/hotel.md
@@ -0,0 +1,2 @@
+Test file; please ignore
+------------------------