From 8c54d7a7eefa4326bc0f5c93b4dd7746b1dcccc6 Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Wed, 13 Mar 2024 21:42:37 +0100 Subject: [PATCH 1/2] Create README.md --- packages/framework/tests/helpers/README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 packages/framework/tests/helpers/README.md diff --git a/packages/framework/tests/helpers/README.md b/packages/framework/tests/helpers/README.md new file mode 100644 index 00000000000..808aa47e8ce --- /dev/null +++ b/packages/framework/tests/helpers/README.md @@ -0,0 +1,3 @@ +# Internal testing helpers + +This directory contains a set of internal testing helpers that are included directly by some tests. From 8d4ffc7f599c578d3bcdcf7a151f09a3c18ed34d Mon Sep 17 00:00:00 2001 From: Caen De Silva Date: Wed, 13 Mar 2024 21:49:09 +0100 Subject: [PATCH 2/2] Move testing helper classes to new helpers directory --- .../tests/Unit/Pages/BladePageUnitTest.php | 11 ++++++----- .../tests/Unit/Pages/DocumentationPageUnitTest.php | 13 +++++++------ .../framework/tests/Unit/Pages/HtmlPageUnitTest.php | 11 ++++++----- .../tests/Unit/Pages/InMemoryPageUnitTest.php | 11 ++++++----- .../tests/Unit/Pages/MarkdownPageUnitTest.php | 13 +++++++------ .../tests/Unit/Pages/MarkdownPostUnitTest.php | 13 +++++++------ .../Pages => helpers}/BaseHydePageUnitTest.php | 10 +++++----- .../Pages => helpers}/BaseMarkdownPageUnitTest.php | 4 ++-- 8 files changed, 46 insertions(+), 40 deletions(-) rename packages/framework/tests/{Unit/Pages => helpers}/BaseHydePageUnitTest.php (98%) rename packages/framework/tests/{Unit/Pages => helpers}/BaseMarkdownPageUnitTest.php (81%) diff --git a/packages/framework/tests/Unit/Pages/BladePageUnitTest.php b/packages/framework/tests/Unit/Pages/BladePageUnitTest.php index 7376f56a15e..755ea5cbfe8 100644 --- a/packages/framework/tests/Unit/Pages/BladePageUnitTest.php +++ b/packages/framework/tests/Unit/Pages/BladePageUnitTest.php @@ -4,15 +4,16 @@ namespace Hyde\Framework\Testing\Unit\Pages; -use Hyde\Foundation\Kernel\PageCollection; -use Hyde\Framework\Factories\Concerns\CoreDataObject; -use Hyde\Framework\Features\Metadata\PageMetadataBag; use Hyde\Hyde; -use Hyde\Markdown\Models\FrontMatter; use Hyde\Pages\BladePage; use Hyde\Support\Models\Route; +use Hyde\Markdown\Models\FrontMatter; +use Hyde\Foundation\Kernel\PageCollection; +use Hyde\Framework\Factories\Concerns\CoreDataObject; +use Hyde\Framework\Features\Metadata\PageMetadataBag; +use Hyde\Framework\Testing\helpers\BaseHydePageUnitTest; -require_once __DIR__.'/BaseHydePageUnitTest.php'; +require_once __DIR__.'/../../helpers/BaseHydePageUnitTest.php'; /** * @covers \Hyde\Pages\BladePage diff --git a/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php b/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php index 2ef2ae376ed..2bc6c8f4755 100644 --- a/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php +++ b/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php @@ -4,17 +4,18 @@ namespace Hyde\Framework\Testing\Unit\Pages; +use Hyde\Hyde; use Hyde\Facades\Filesystem; +use Hyde\Support\Models\Route; +use Hyde\Pages\DocumentationPage; +use Hyde\Markdown\Models\Markdown; +use Hyde\Markdown\Models\FrontMatter; use Hyde\Foundation\Kernel\PageCollection; use Hyde\Framework\Factories\Concerns\CoreDataObject; use Hyde\Framework\Features\Metadata\PageMetadataBag; -use Hyde\Hyde; -use Hyde\Markdown\Models\FrontMatter; -use Hyde\Markdown\Models\Markdown; -use Hyde\Pages\DocumentationPage; -use Hyde\Support\Models\Route; +use Hyde\Framework\Testing\helpers\BaseMarkdownPageUnitTest; -require_once __DIR__.'/BaseMarkdownPageUnitTest.php'; +require_once __DIR__.'/../../helpers/BaseMarkdownPageUnitTest.php'; /** * @covers \Hyde\Pages\DocumentationPage diff --git a/packages/framework/tests/Unit/Pages/HtmlPageUnitTest.php b/packages/framework/tests/Unit/Pages/HtmlPageUnitTest.php index c634358579b..16676f7b90e 100644 --- a/packages/framework/tests/Unit/Pages/HtmlPageUnitTest.php +++ b/packages/framework/tests/Unit/Pages/HtmlPageUnitTest.php @@ -4,15 +4,16 @@ namespace Hyde\Framework\Testing\Unit\Pages; -use Hyde\Foundation\Kernel\PageCollection; -use Hyde\Framework\Factories\Concerns\CoreDataObject; -use Hyde\Framework\Features\Metadata\PageMetadataBag; use Hyde\Hyde; -use Hyde\Markdown\Models\FrontMatter; use Hyde\Pages\HtmlPage; use Hyde\Support\Models\Route; +use Hyde\Markdown\Models\FrontMatter; +use Hyde\Foundation\Kernel\PageCollection; +use Hyde\Framework\Factories\Concerns\CoreDataObject; +use Hyde\Framework\Features\Metadata\PageMetadataBag; +use Hyde\Framework\Testing\helpers\BaseHydePageUnitTest; -require_once __DIR__.'/BaseHydePageUnitTest.php'; +require_once __DIR__.'/../../helpers/BaseHydePageUnitTest.php'; /** * @covers \Hyde\Pages\HtmlPage diff --git a/packages/framework/tests/Unit/Pages/InMemoryPageUnitTest.php b/packages/framework/tests/Unit/Pages/InMemoryPageUnitTest.php index 2169a655ebc..a3a116b0ecf 100644 --- a/packages/framework/tests/Unit/Pages/InMemoryPageUnitTest.php +++ b/packages/framework/tests/Unit/Pages/InMemoryPageUnitTest.php @@ -4,16 +4,17 @@ namespace Hyde\Framework\Testing\Unit\Pages; +use Hyde\Hyde; +use Hyde\Pages\InMemoryPage; +use Hyde\Support\Models\Route; use Hyde\Foundation\HydeKernel; +use Hyde\Markdown\Models\FrontMatter; use Hyde\Foundation\Kernel\PageCollection; use Hyde\Framework\Factories\Concerns\CoreDataObject; use Hyde\Framework\Features\Metadata\PageMetadataBag; -use Hyde\Hyde; -use Hyde\Markdown\Models\FrontMatter; -use Hyde\Pages\InMemoryPage; -use Hyde\Support\Models\Route; +use Hyde\Framework\Testing\helpers\BaseHydePageUnitTest; -require_once __DIR__.'/BaseHydePageUnitTest.php'; +require_once __DIR__.'/../../helpers/BaseHydePageUnitTest.php'; /** * @covers \Hyde\Pages\InMemoryPage diff --git a/packages/framework/tests/Unit/Pages/MarkdownPageUnitTest.php b/packages/framework/tests/Unit/Pages/MarkdownPageUnitTest.php index 1942e97f108..4299c39e7f1 100644 --- a/packages/framework/tests/Unit/Pages/MarkdownPageUnitTest.php +++ b/packages/framework/tests/Unit/Pages/MarkdownPageUnitTest.php @@ -4,17 +4,18 @@ namespace Hyde\Framework\Testing\Unit\Pages; +use Hyde\Hyde; use Hyde\Facades\Filesystem; +use Hyde\Pages\MarkdownPage; +use Hyde\Support\Models\Route; +use Hyde\Markdown\Models\Markdown; +use Hyde\Markdown\Models\FrontMatter; use Hyde\Foundation\Kernel\PageCollection; use Hyde\Framework\Factories\Concerns\CoreDataObject; use Hyde\Framework\Features\Metadata\PageMetadataBag; -use Hyde\Hyde; -use Hyde\Markdown\Models\FrontMatter; -use Hyde\Markdown\Models\Markdown; -use Hyde\Pages\MarkdownPage; -use Hyde\Support\Models\Route; +use Hyde\Framework\Testing\helpers\BaseMarkdownPageUnitTest; -require_once __DIR__.'/BaseMarkdownPageUnitTest.php'; +require_once __DIR__.'/../../helpers/BaseMarkdownPageUnitTest.php'; /** * @covers \Hyde\Pages\MarkdownPage diff --git a/packages/framework/tests/Unit/Pages/MarkdownPostUnitTest.php b/packages/framework/tests/Unit/Pages/MarkdownPostUnitTest.php index 9bddaf592b7..08a859d078e 100644 --- a/packages/framework/tests/Unit/Pages/MarkdownPostUnitTest.php +++ b/packages/framework/tests/Unit/Pages/MarkdownPostUnitTest.php @@ -4,17 +4,18 @@ namespace Hyde\Framework\Testing\Unit\Pages; +use Hyde\Hyde; use Hyde\Facades\Filesystem; +use Hyde\Pages\MarkdownPost; +use Hyde\Support\Models\Route; +use Hyde\Markdown\Models\Markdown; +use Hyde\Markdown\Models\FrontMatter; use Hyde\Foundation\Kernel\PageCollection; use Hyde\Framework\Factories\Concerns\CoreDataObject; use Hyde\Framework\Features\Metadata\PageMetadataBag; -use Hyde\Hyde; -use Hyde\Markdown\Models\FrontMatter; -use Hyde\Markdown\Models\Markdown; -use Hyde\Pages\MarkdownPost; -use Hyde\Support\Models\Route; +use Hyde\Framework\Testing\helpers\BaseMarkdownPageUnitTest; -require_once __DIR__.'/BaseMarkdownPageUnitTest.php'; +require_once __DIR__.'/../../helpers/BaseMarkdownPageUnitTest.php'; /** * @covers \Hyde\Pages\MarkdownPost diff --git a/packages/framework/tests/Unit/Pages/BaseHydePageUnitTest.php b/packages/framework/tests/helpers/BaseHydePageUnitTest.php similarity index 98% rename from packages/framework/tests/Unit/Pages/BaseHydePageUnitTest.php rename to packages/framework/tests/helpers/BaseHydePageUnitTest.php index ce7b358e5e6..042d966072f 100644 --- a/packages/framework/tests/Unit/Pages/BaseHydePageUnitTest.php +++ b/packages/framework/tests/helpers/BaseHydePageUnitTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace Hyde\Framework\Testing\Unit\Pages; +namespace Hyde\Framework\Testing\helpers; +use Mockery; +use Illuminate\View\Factory; +use Hyde\Testing\UnitTestCase; use Hyde\Support\Facades\Render; use Hyde\Support\Models\RenderData; -use Hyde\Testing\CreatesTemporaryFiles; -use Hyde\Testing\UnitTestCase; use Illuminate\Support\Facades\View; -use Illuminate\View\Factory; -use Mockery; +use Hyde\Testing\CreatesTemporaryFiles; /** * Providers helpers and a contract for unit testing for the specified page class. diff --git a/packages/framework/tests/Unit/Pages/BaseMarkdownPageUnitTest.php b/packages/framework/tests/helpers/BaseMarkdownPageUnitTest.php similarity index 81% rename from packages/framework/tests/Unit/Pages/BaseMarkdownPageUnitTest.php rename to packages/framework/tests/helpers/BaseMarkdownPageUnitTest.php index d84c6e706b0..34d48d8219f 100644 --- a/packages/framework/tests/Unit/Pages/BaseMarkdownPageUnitTest.php +++ b/packages/framework/tests/helpers/BaseMarkdownPageUnitTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Hyde\Framework\Testing\Unit\Pages; +namespace Hyde\Framework\Testing\helpers; require_once __DIR__.'/BaseHydePageUnitTest.php'; @@ -11,7 +11,7 @@ * * These unit tests ensure all inherited methods are callable, and that they return the expected value. * - * @see \Hyde\Framework\Testing\Unit\Pages\BaseHydePageUnitTest + * @see \Hyde\Framework\Testing\helpers\BaseHydePageUnitTest * * @coversNothing */