From cc90bb88107e39cc81e7824287e2bf0d918dced0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:10:03 +0200
Subject: [PATCH 01/24] Remove newlines from code comments

---
 .../tests/Feature/PostsAuthorIntegrationTest.php         | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 9ecfc06093f..449f4ae9cc2 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -12,8 +12,7 @@
 use Illuminate\Support\Facades\Config;
 
 /**
- * Test that the Author feature works in
- * conjunction with the static Post generator.
+ * Test that the Author feature works in conjunction with the static Post generator.
  *
  * @see StaticSiteBuilderPostModuleTest
  */
@@ -27,11 +26,9 @@ protected function setUp(): void
     }
 
     /**
-     * Baseline test to create a post without a defined author,
-     * and assert that the username is displayed as is.
+     * Baseline test to create a post without a defined author, and assert that the username is displayed as is.
      *
-     * Check that the author was not defined.
-     * We do this by building the static site and inspecting the DOM.
+     * Check that the author was not defined. We do this by building the static site and inspecting the DOM.
      */
     public function testCreatePostWithUndefinedAuthor()
     {

From e9a28322660c55fd74d3baa6ad7754ce7d435ceb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:10:19 +0200
Subject: [PATCH 02/24] Reword commends to be more fluent

---
 packages/framework/tests/Feature/PostsAuthorIntegrationTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 449f4ae9cc2..7273bf93be2 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
     /**
      * Baseline test to create a post without a defined author, and assert that the username is displayed as is.
      *
-     * Check that the author was not defined. We do this by building the static site and inspecting the DOM.
+     * Checks that the author was not defined, we do this by building the static site and inspecting the DOM.
      */
     public function testCreatePostWithUndefinedAuthor()
     {

From dab8512350bbd658529cac6a3c8047efce1817c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:10:43 +0200
Subject: [PATCH 03/24] Remove unnecessary identifier from test file name

---
 .../Feature/PostsAuthorIntegrationTest.php    | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 7273bf93be2..2935ad70f88 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -34,30 +34,30 @@ public function testCreatePostWithUndefinedAuthor()
     {
         // Create a new post
         (new CreatesNewMarkdownPostFile(
-            title: 'test-2dcbb2c-post-with-undefined-author',
+            title: 'test-post-with-undefined-author',
             description: '',
             category: '',
             author: 'test_undefined_author'
         ))->save(true);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-undefined-author.md'));
+        $this->assertFileExists(Hyde::path('_posts/test-post-with-undefined-author.md'));
 
         // Build the static page
-        $this->artisan('rebuild _posts/test-2dcbb2c-post-with-undefined-author.md')->assertExitCode(0);
+        $this->artisan('rebuild _posts/test-post-with-undefined-author.md')->assertExitCode(0);
 
         // Check that the file was created
-        $this->assertFileExists(Hyde::path('_site/posts/test-2dcbb2c-post-with-undefined-author.html'));
+        $this->assertFileExists(Hyde::path('_site/posts/test-post-with-undefined-author.html'));
 
         // Check that the author is rendered as is in the DOM
         $this->assertStringContainsString(
             '>test_undefined_author</span>',
-            file_get_contents(Hyde::path('_site/posts/test-2dcbb2c-post-with-undefined-author.html'))
+            file_get_contents(Hyde::path('_site/posts/test-post-with-undefined-author.html'))
         );
 
         // Remove the test files
-        Filesystem::unlink('_posts/test-2dcbb2c-post-with-undefined-author.md');
-        Filesystem::unlink('_site/posts/test-2dcbb2c-post-with-undefined-author.html');
+        Filesystem::unlink('_posts/test-post-with-undefined-author.md');
+        Filesystem::unlink('_site/posts/test-post-with-undefined-author.html');
     }
 
     /**
@@ -67,35 +67,35 @@ public function testCreatePostWithDefinedAuthorWithName()
     {
         // Create a new post
         (new CreatesNewMarkdownPostFile(
-            title: 'test-2dcbb2c-post-with-defined-author-with-name',
+            title: 'test-post-with-defined-author-with-name',
             description: '',
             category: '',
             author: 'test_named_author'
         ))->save(true);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
+        $this->assertFileExists(Hyde::path('_posts/test-post-with-defined-author-with-name.md'));
 
         Config::set('hyde.authors', [
             Author::create('test_named_author', 'Test Author', null),
         ]);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
+        $this->assertFileExists(Hyde::path('_posts/test-post-with-defined-author-with-name.md'));
         // Build the static page
-        $this->artisan('rebuild _posts/test-2dcbb2c-post-with-defined-author-with-name.md')->assertExitCode(0);
+        $this->artisan('rebuild _posts/test-post-with-defined-author-with-name.md')->assertExitCode(0);
         // Check that the file was created
-        $this->assertFileExists(Hyde::path('_site/posts/test-2dcbb2c-post-with-defined-author-with-name.html'));
+        $this->assertFileExists(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'));
 
         // Check that the author is contains the set name in the DOM
         $this->assertStringContainsString(
             '<span itemprop="name" aria-label="The author\'s name" title=@test_named_author>Test Author</span>',
-            file_get_contents(Hyde::path('_site/posts/test-2dcbb2c-post-with-defined-author-with-name.html'))
+            file_get_contents(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'))
         );
 
         // Remove the test files
-        Filesystem::unlink('_posts/test-2dcbb2c-post-with-defined-author-with-name.md');
-        Filesystem::unlink('_site/posts/test-2dcbb2c-post-with-defined-author-with-name.html');
+        Filesystem::unlink('_posts/test-post-with-defined-author-with-name.md');
+        Filesystem::unlink('_site/posts/test-post-with-defined-author-with-name.html');
     }
 
     /**
@@ -105,40 +105,40 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
     {
         // Create a new post
         (new CreatesNewMarkdownPostFile(
-            title: 'test-2dcbb2c-post-with-defined-author-with-name',
+            title: 'test-post-with-defined-author-with-name',
             description: '',
             category: '',
             author: 'test_author_with_website'
         ))->save(true);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
+        $this->assertFileExists(Hyde::path('_posts/test-post-with-defined-author-with-name.md'));
 
         Config::set('hyde.authors', [
             Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
         ]);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
+        $this->assertFileExists(Hyde::path('_posts/test-post-with-defined-author-with-name.md'));
         // Build the static page
-        $this->artisan('rebuild _posts/test-2dcbb2c-post-with-defined-author-with-name.md')->assertExitCode(0);
+        $this->artisan('rebuild _posts/test-post-with-defined-author-with-name.md')->assertExitCode(0);
         // Check that the file was created
-        $this->assertFileExists(Hyde::path('_site/posts/test-2dcbb2c-post-with-defined-author-with-name.html'));
+        $this->assertFileExists(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'));
 
         // Check that the author is contains the set name in the DOM
         $this->assertStringContainsString(
             '<span itemprop="name" aria-label="The author\'s name" title=@test_author_with_website>Test Author</span>',
-            file_get_contents(Hyde::path('_site/posts/test-2dcbb2c-post-with-defined-author-with-name.html'))
+            file_get_contents(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'))
         );
 
         // Check that the author is contains the set website in the DOM
         $this->assertStringContainsString(
             '<a href="https://example.org" rel="author" itemprop="url" aria-label="The author\'s website">',
-            file_get_contents(Hyde::path('_site/posts/test-2dcbb2c-post-with-defined-author-with-name.html'))
+            file_get_contents(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'))
         );
 
         // Remove the test files
-        Filesystem::unlink('_posts/test-2dcbb2c-post-with-defined-author-with-name.md');
-        Filesystem::unlink('_site/posts/test-2dcbb2c-post-with-defined-author-with-name.html');
+        Filesystem::unlink('_posts/test-post-with-defined-author-with-name.md');
+        Filesystem::unlink('_site/posts/test-post-with-defined-author-with-name.html');
     }
 }

From edea953efe630ef1079fe25d85c1179599bae01a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:11:27 +0200
Subject: [PATCH 04/24] Remove unnecessary prefixes from test data

---
 .../Feature/PostsAuthorIntegrationTest.php    | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 2935ad70f88..63624291113 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -34,30 +34,30 @@ public function testCreatePostWithUndefinedAuthor()
     {
         // Create a new post
         (new CreatesNewMarkdownPostFile(
-            title: 'test-post-with-undefined-author',
+            title: 'post-with-undefined-author',
             description: '',
             category: '',
             author: 'test_undefined_author'
         ))->save(true);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-post-with-undefined-author.md'));
+        $this->assertFileExists(Hyde::path('_posts/post-with-undefined-author.md'));
 
         // Build the static page
-        $this->artisan('rebuild _posts/test-post-with-undefined-author.md')->assertExitCode(0);
+        $this->artisan('rebuild _posts/post-with-undefined-author.md')->assertExitCode(0);
 
         // Check that the file was created
-        $this->assertFileExists(Hyde::path('_site/posts/test-post-with-undefined-author.html'));
+        $this->assertFileExists(Hyde::path('_site/posts/post-with-undefined-author.html'));
 
         // Check that the author is rendered as is in the DOM
         $this->assertStringContainsString(
             '>test_undefined_author</span>',
-            file_get_contents(Hyde::path('_site/posts/test-post-with-undefined-author.html'))
+            file_get_contents(Hyde::path('_site/posts/post-with-undefined-author.html'))
         );
 
         // Remove the test files
-        Filesystem::unlink('_posts/test-post-with-undefined-author.md');
-        Filesystem::unlink('_site/posts/test-post-with-undefined-author.html');
+        Filesystem::unlink('_posts/post-with-undefined-author.md');
+        Filesystem::unlink('_site/posts/post-with-undefined-author.html');
     }
 
     /**
@@ -67,35 +67,35 @@ public function testCreatePostWithDefinedAuthorWithName()
     {
         // Create a new post
         (new CreatesNewMarkdownPostFile(
-            title: 'test-post-with-defined-author-with-name',
+            title: 'post-with-defined-author-with-name',
             description: '',
             category: '',
-            author: 'test_named_author'
+            author: 'named_author'
         ))->save(true);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-post-with-defined-author-with-name.md'));
+        $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
 
         Config::set('hyde.authors', [
-            Author::create('test_named_author', 'Test Author', null),
+            Author::create('named_author', 'Test Author', null),
         ]);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-post-with-defined-author-with-name.md'));
+        $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
         // Build the static page
-        $this->artisan('rebuild _posts/test-post-with-defined-author-with-name.md')->assertExitCode(0);
+        $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
         // Check that the file was created
-        $this->assertFileExists(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'));
+        $this->assertFileExists(Hyde::path('_site/posts/post-with-defined-author-with-name.html'));
 
         // Check that the author is contains the set name in the DOM
         $this->assertStringContainsString(
-            '<span itemprop="name" aria-label="The author\'s name" title=@test_named_author>Test Author</span>',
-            file_get_contents(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'))
+            '<span itemprop="name" aria-label="The author\'s name" title=@named_author>Test Author</span>',
+            file_get_contents(Hyde::path('_site/posts/post-with-defined-author-with-name.html'))
         );
 
         // Remove the test files
-        Filesystem::unlink('_posts/test-post-with-defined-author-with-name.md');
-        Filesystem::unlink('_site/posts/test-post-with-defined-author-with-name.html');
+        Filesystem::unlink('_posts/post-with-defined-author-with-name.md');
+        Filesystem::unlink('_site/posts/post-with-defined-author-with-name.html');
     }
 
     /**
@@ -105,40 +105,40 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
     {
         // Create a new post
         (new CreatesNewMarkdownPostFile(
-            title: 'test-post-with-defined-author-with-name',
+            title: 'post-with-defined-author-with-name',
             description: '',
             category: '',
             author: 'test_author_with_website'
         ))->save(true);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-post-with-defined-author-with-name.md'));
+        $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
 
         Config::set('hyde.authors', [
             Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
         ]);
 
         // Check that the post was created
-        $this->assertFileExists(Hyde::path('_posts/test-post-with-defined-author-with-name.md'));
+        $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
         // Build the static page
-        $this->artisan('rebuild _posts/test-post-with-defined-author-with-name.md')->assertExitCode(0);
+        $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
         // Check that the file was created
-        $this->assertFileExists(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'));
+        $this->assertFileExists(Hyde::path('_site/posts/post-with-defined-author-with-name.html'));
 
         // Check that the author is contains the set name in the DOM
         $this->assertStringContainsString(
             '<span itemprop="name" aria-label="The author\'s name" title=@test_author_with_website>Test Author</span>',
-            file_get_contents(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'))
+            file_get_contents(Hyde::path('_site/posts/post-with-defined-author-with-name.html'))
         );
 
         // Check that the author is contains the set website in the DOM
         $this->assertStringContainsString(
             '<a href="https://example.org" rel="author" itemprop="url" aria-label="The author\'s website">',
-            file_get_contents(Hyde::path('_site/posts/test-post-with-defined-author-with-name.html'))
+            file_get_contents(Hyde::path('_site/posts/post-with-defined-author-with-name.html'))
         );
 
         // Remove the test files
-        Filesystem::unlink('_posts/test-post-with-defined-author-with-name.md');
-        Filesystem::unlink('_site/posts/test-post-with-defined-author-with-name.html');
+        Filesystem::unlink('_posts/post-with-defined-author-with-name.md');
+        Filesystem::unlink('_site/posts/post-with-defined-author-with-name.html');
     }
 }

From c9f25d95a2b09469d5d95d20eabd45febb9c6112 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:13:27 +0200
Subject: [PATCH 05/24] Remove unnecessary force parameter usage

---
 .../framework/tests/Feature/PostsAuthorIntegrationTest.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 63624291113..188d557297d 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -38,7 +38,7 @@ public function testCreatePostWithUndefinedAuthor()
             description: '',
             category: '',
             author: 'test_undefined_author'
-        ))->save(true);
+        ))->save();
 
         // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/post-with-undefined-author.md'));
@@ -71,7 +71,7 @@ public function testCreatePostWithDefinedAuthorWithName()
             description: '',
             category: '',
             author: 'named_author'
-        ))->save(true);
+        ))->save();
 
         // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
@@ -109,7 +109,7 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
             description: '',
             category: '',
             author: 'test_author_with_website'
-        ))->save(true);
+        ))->save();
 
         // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));

From 71a95c42ac1f9b27e011ced5875f1afac6fec18e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:14:31 +0200
Subject: [PATCH 06/24] Remove unnecessary test code comments

---
 .../Feature/PostsAuthorIntegrationTest.php    | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 188d557297d..a520012719b 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -32,7 +32,6 @@ protected function setUp(): void
      */
     public function testCreatePostWithUndefinedAuthor()
     {
-        // Create a new post
         (new CreatesNewMarkdownPostFile(
             title: 'post-with-undefined-author',
             description: '',
@@ -40,13 +39,8 @@ public function testCreatePostWithUndefinedAuthor()
             author: 'test_undefined_author'
         ))->save();
 
-        // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/post-with-undefined-author.md'));
-
-        // Build the static page
         $this->artisan('rebuild _posts/post-with-undefined-author.md')->assertExitCode(0);
-
-        // Check that the file was created
         $this->assertFileExists(Hyde::path('_site/posts/post-with-undefined-author.html'));
 
         // Check that the author is rendered as is in the DOM
@@ -55,7 +49,6 @@ public function testCreatePostWithUndefinedAuthor()
             file_get_contents(Hyde::path('_site/posts/post-with-undefined-author.html'))
         );
 
-        // Remove the test files
         Filesystem::unlink('_posts/post-with-undefined-author.md');
         Filesystem::unlink('_site/posts/post-with-undefined-author.html');
     }
@@ -65,7 +58,6 @@ public function testCreatePostWithUndefinedAuthor()
      */
     public function testCreatePostWithDefinedAuthorWithName()
     {
-        // Create a new post
         (new CreatesNewMarkdownPostFile(
             title: 'post-with-defined-author-with-name',
             description: '',
@@ -73,18 +65,14 @@ public function testCreatePostWithDefinedAuthorWithName()
             author: 'named_author'
         ))->save();
 
-        // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
 
         Config::set('hyde.authors', [
             Author::create('named_author', 'Test Author', null),
         ]);
 
-        // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
-        // Build the static page
         $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
-        // Check that the file was created
         $this->assertFileExists(Hyde::path('_site/posts/post-with-defined-author-with-name.html'));
 
         // Check that the author is contains the set name in the DOM
@@ -93,7 +81,6 @@ public function testCreatePostWithDefinedAuthorWithName()
             file_get_contents(Hyde::path('_site/posts/post-with-defined-author-with-name.html'))
         );
 
-        // Remove the test files
         Filesystem::unlink('_posts/post-with-defined-author-with-name.md');
         Filesystem::unlink('_site/posts/post-with-defined-author-with-name.html');
     }
@@ -103,7 +90,6 @@ public function testCreatePostWithDefinedAuthorWithName()
      */
     public function testCreatePostWithDefinedAuthorWithWebsite()
     {
-        // Create a new post
         (new CreatesNewMarkdownPostFile(
             title: 'post-with-defined-author-with-name',
             description: '',
@@ -111,18 +97,14 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
             author: 'test_author_with_website'
         ))->save();
 
-        // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
 
         Config::set('hyde.authors', [
             Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
         ]);
 
-        // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
-        // Build the static page
         $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
-        // Check that the file was created
         $this->assertFileExists(Hyde::path('_site/posts/post-with-defined-author-with-name.html'));
 
         // Check that the author is contains the set name in the DOM
@@ -137,7 +119,6 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
             file_get_contents(Hyde::path('_site/posts/post-with-defined-author-with-name.html'))
         );
 
-        // Remove the test files
         Filesystem::unlink('_posts/post-with-defined-author-with-name.md');
         Filesystem::unlink('_site/posts/post-with-defined-author-with-name.html');
     }

From 123b592f11d671d06ac7ec4238f80f73a6cd6dab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:18:46 +0200
Subject: [PATCH 07/24] Extract testing helper method

---
 .../Feature/PostsAuthorIntegrationTest.php    | 35 ++++++-------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index a520012719b..5c8f7d78efc 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -32,14 +32,8 @@ protected function setUp(): void
      */
     public function testCreatePostWithUndefinedAuthor()
     {
-        (new CreatesNewMarkdownPostFile(
-            title: 'post-with-undefined-author',
-            description: '',
-            category: '',
-            author: 'test_undefined_author'
-        ))->save();
-
-        $this->assertFileExists(Hyde::path('_posts/post-with-undefined-author.md'));
+        $this->createPostFile('post-with-undefined-author', 'test_undefined_author');
+
         $this->artisan('rebuild _posts/post-with-undefined-author.md')->assertExitCode(0);
         $this->assertFileExists(Hyde::path('_site/posts/post-with-undefined-author.html'));
 
@@ -58,14 +52,7 @@ public function testCreatePostWithUndefinedAuthor()
      */
     public function testCreatePostWithDefinedAuthorWithName()
     {
-        (new CreatesNewMarkdownPostFile(
-            title: 'post-with-defined-author-with-name',
-            description: '',
-            category: '',
-            author: 'named_author'
-        ))->save();
-
-        $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
+        $this->createPostFile('post-with-defined-author-with-name', 'named_author');
 
         Config::set('hyde.authors', [
             Author::create('named_author', 'Test Author', null),
@@ -90,14 +77,7 @@ public function testCreatePostWithDefinedAuthorWithName()
      */
     public function testCreatePostWithDefinedAuthorWithWebsite()
     {
-        (new CreatesNewMarkdownPostFile(
-            title: 'post-with-defined-author-with-name',
-            description: '',
-            category: '',
-            author: 'test_author_with_website'
-        ))->save();
-
-        $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
+        $this->createPostFile('post-with-defined-author-with-name', 'test_author_with_website');
 
         Config::set('hyde.authors', [
             Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
@@ -122,4 +102,11 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
         Filesystem::unlink('_posts/post-with-defined-author-with-name.md');
         Filesystem::unlink('_site/posts/post-with-defined-author-with-name.html');
     }
+
+    protected function createPostFile(string $title, string $author): void
+    {
+        (new CreatesNewMarkdownPostFile(title: $title, description: '', category: '', author: $author))->save();
+
+        $this->assertFileExists(Hyde::path('_posts/'.$title.'.md'));
+    }
 }

From 4e30713e8971af1b0225e1f9c73972c8adb04cda Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:21:51 +0200
Subject: [PATCH 08/24] Automatically handle test file cleanup

---
 .../tests/Feature/PostsAuthorIntegrationTest.php    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 5c8f7d78efc..d10ad5656e7 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Facades\Author;
-use Hyde\Facades\Filesystem;
 use Hyde\Framework\Actions\CreatesNewMarkdownPostFile;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -42,9 +41,6 @@ public function testCreatePostWithUndefinedAuthor()
             '>test_undefined_author</span>',
             file_get_contents(Hyde::path('_site/posts/post-with-undefined-author.html'))
         );
-
-        Filesystem::unlink('_posts/post-with-undefined-author.md');
-        Filesystem::unlink('_site/posts/post-with-undefined-author.html');
     }
 
     /**
@@ -67,9 +63,6 @@ public function testCreatePostWithDefinedAuthorWithName()
             '<span itemprop="name" aria-label="The author\'s name" title=@named_author>Test Author</span>',
             file_get_contents(Hyde::path('_site/posts/post-with-defined-author-with-name.html'))
         );
-
-        Filesystem::unlink('_posts/post-with-defined-author-with-name.md');
-        Filesystem::unlink('_site/posts/post-with-defined-author-with-name.html');
     }
 
     /**
@@ -98,9 +91,6 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
             '<a href="https://example.org" rel="author" itemprop="url" aria-label="The author\'s website">',
             file_get_contents(Hyde::path('_site/posts/post-with-defined-author-with-name.html'))
         );
-
-        Filesystem::unlink('_posts/post-with-defined-author-with-name.md');
-        Filesystem::unlink('_site/posts/post-with-defined-author-with-name.html');
     }
 
     protected function createPostFile(string $title, string $author): void
@@ -108,5 +98,8 @@ protected function createPostFile(string $title, string $author): void
         (new CreatesNewMarkdownPostFile(title: $title, description: '', category: '', author: $author))->save();
 
         $this->assertFileExists(Hyde::path('_posts/'.$title.'.md'));
+
+        $this->cleanUpWhenDone('_posts/'.$title.'.md');
+        $this->cleanUpWhenDone('_site/posts/'.$title.'.html');
     }
 }

From f73bb76cf2430042d58c9a0caffebcce91a1543f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:23:13 +0200
Subject: [PATCH 09/24] Convert concatenation to string interpolation

---
 .../framework/tests/Feature/PostsAuthorIntegrationTest.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index d10ad5656e7..b506644636a 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -97,9 +97,9 @@ protected function createPostFile(string $title, string $author): void
     {
         (new CreatesNewMarkdownPostFile(title: $title, description: '', category: '', author: $author))->save();
 
-        $this->assertFileExists(Hyde::path('_posts/'.$title.'.md'));
+        $this->assertFileExists(Hyde::path("_posts/$title.md"));
 
-        $this->cleanUpWhenDone('_posts/'.$title.'.md');
-        $this->cleanUpWhenDone('_site/posts/'.$title.'.html');
+        $this->cleanUpWhenDone("_posts/$title.md");
+        $this->cleanUpWhenDone("_site/posts/$title.html");
     }
 }

From 7feca1e08b45ec0857059d1c1df3bdf29531dae5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:23:50 +0200
Subject: [PATCH 10/24] Remove unnecessary named arguments

---
 packages/framework/tests/Feature/PostsAuthorIntegrationTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index b506644636a..86f6c9eb6db 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -95,7 +95,7 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
 
     protected function createPostFile(string $title, string $author): void
     {
-        (new CreatesNewMarkdownPostFile(title: $title, description: '', category: '', author: $author))->save();
+        (new CreatesNewMarkdownPostFile($title, '', '', $author))->save();
 
         $this->assertFileExists(Hyde::path("_posts/$title.md"));
 

From 159649029e22dcda6fbe4a19c75e8aba1b52812b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:24:51 +0200
Subject: [PATCH 11/24] Remove already made assertions

---
 packages/framework/tests/Feature/PostsAuthorIntegrationTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 86f6c9eb6db..a8e1a134eae 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -54,7 +54,6 @@ public function testCreatePostWithDefinedAuthorWithName()
             Author::create('named_author', 'Test Author', null),
         ]);
 
-        $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
         $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
         $this->assertFileExists(Hyde::path('_site/posts/post-with-defined-author-with-name.html'));
 
@@ -76,7 +75,6 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
             Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
         ]);
 
-        $this->assertFileExists(Hyde::path('_posts/post-with-defined-author-with-name.md'));
         $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
         $this->assertFileExists(Hyde::path('_site/posts/post-with-defined-author-with-name.html'));
 

From 7d6c3d7fabe870141689fc9cd2ed3cb0dc593a44 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:25:59 +0200
Subject: [PATCH 12/24] Add 'void' as the function's return type

---
 .../framework/tests/Feature/StaticSiteBuilderPostModuleTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
index b94742e9d5a..ec5cbec504e 100644
--- a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
@@ -45,7 +45,7 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
-    protected function inspectHtml(array $expectedStrings)
+    protected function inspectHtml(array $expectedStrings): void
     {
         StaticPageBuilder::handle($this->post);
         $stream = file_get_contents(Hyde::path('_site/posts/test-post.html'));

From 1198b12aa90d91aafd1080dff6dc2f86516aa48c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:26:11 +0200
Subject: [PATCH 13/24] Move down helper method in test

---
 .../StaticSiteBuilderPostModuleTest.php       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
index ec5cbec504e..10af1b63700 100644
--- a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
@@ -45,16 +45,6 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
-    protected function inspectHtml(array $expectedStrings): void
-    {
-        StaticPageBuilder::handle($this->post);
-        $stream = file_get_contents(Hyde::path('_site/posts/test-post.html'));
-
-        foreach ($expectedStrings as $expectedString) {
-            $this->assertStringContainsString($expectedString, $stream);
-        }
-    }
-
     public function testCanCreatePost()
     {
         StaticPageBuilder::handle($this->post);
@@ -134,4 +124,14 @@ public function testPostImageIsResolvedRelatively()
             '<meta itemprop="contentUrl" content="../media/image.png">',
         ]);
     }
+
+    protected function inspectHtml(array $expectedStrings): void
+    {
+        StaticPageBuilder::handle($this->post);
+        $stream = file_get_contents(Hyde::path('_site/posts/test-post.html'));
+
+        foreach ($expectedStrings as $expectedString) {
+            $this->assertStringContainsString($expectedString, $stream);
+        }
+    }
 }

From 7395ad517465fef5a0953fa9079f41d5c3ccd6e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:26:44 +0200
Subject: [PATCH 14/24] Add 'void' as the function's return type

---
 .../tests/Feature/StaticSiteBuilderDocumentationModuleTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php
index 807059a5688..34997b3130c 100644
--- a/packages/framework/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php
@@ -31,7 +31,7 @@ protected function setUp(): void
         );
     }
 
-    protected function inspectHtml(array $expectedStrings, string $path = null)
+    protected function inspectHtml(array $expectedStrings, string $path = null): void
     {
         StaticPageBuilder::handle($this->page);
         $stream = file_get_contents(Hyde::path($path ?? '_site/docs/test-page.html'));

From 4532d7a35b238cca21adc12660e7bfe3638f2817 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:26:56 +0200
Subject: [PATCH 15/24] Move down helper method in test

---
 ...aticSiteBuilderDocumentationModuleTest.php | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php
index 34997b3130c..80c20222149 100644
--- a/packages/framework/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderDocumentationModuleTest.php
@@ -31,17 +31,6 @@ protected function setUp(): void
         );
     }
 
-    protected function inspectHtml(array $expectedStrings, string $path = null): void
-    {
-        StaticPageBuilder::handle($this->page);
-        $stream = file_get_contents(Hyde::path($path ?? '_site/docs/test-page.html'));
-        $this->cleanUpWhenDone($path ?? '_site/docs/test-page.html');
-
-        foreach ($expectedStrings as $expectedString) {
-            $this->assertStringContainsString($expectedString, $stream);
-        }
-    }
-
     public function testCanCreatePage()
     {
         StaticPageBuilder::handle($this->page);
@@ -70,4 +59,15 @@ public function testCanCompilePageToRootOutputDirectory()
             '<p>So she was considering in her own mind, as well as she could',
         ], '_site/test-page.html');
     }
+
+    protected function inspectHtml(array $expectedStrings, string $path = null): void
+    {
+        StaticPageBuilder::handle($this->page);
+        $stream = file_get_contents(Hyde::path($path ?? '_site/docs/test-page.html'));
+        $this->cleanUpWhenDone($path ?? '_site/docs/test-page.html');
+
+        foreach ($expectedStrings as $expectedString) {
+            $this->assertStringContainsString($expectedString, $stream);
+        }
+    }
 }

From cede6a05655992939e3fa2e54a8030e1216aac22 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:30:43 +0200
Subject: [PATCH 16/24] Use fault tolerant file memory helpers

---
 .../Feature/Commands/MakePostCommandTest.php      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
index 86dee0670e0..d7064691f4e 100644
--- a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Facades\Filesystem;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
@@ -18,6 +17,7 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
     {
         // Assert that no old file exists which would cause issues
         $this->assertFileDoesNotExist(Hyde::path('_posts/test-post.md'));
+        $this->cleanUpWhenDone('_posts/test-post.md');
 
         $this->artisan('make:post')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
@@ -42,13 +42,11 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
             "title: 'Test Post'",
             file_get_contents(Hyde::path('_posts/test-post.md'))
         );
-
-        Filesystem::unlink('_posts/test-post.md');
     }
 
     public function testThatFilesAreNotOverwrittenWhenForceFlagIsNotSet()
     {
-        file_put_contents(Hyde::path('_posts/test-post.md'), 'This should not be overwritten');
+        $this->file('_posts/test-post.md', 'This should not be overwritten');
         $this->artisan('make:post')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
@@ -65,13 +63,11 @@ public function testThatFilesAreNotOverwrittenWhenForceFlagIsNotSet()
             'This should not be overwritten',
             file_get_contents(Hyde::path('_posts/test-post.md'))
         );
-
-        Filesystem::unlink('_posts/test-post.md');
     }
 
     public function testThatFilesAreOverwrittenWhenForceFlagIsSet()
     {
-        file_put_contents(Hyde::path('_posts/test-post.md'), 'This should be overwritten');
+        $this->file('_posts/test-post.md', 'This should be overwritten');
         $this->artisan('make:post --force')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
@@ -90,12 +86,11 @@ public function testThatFilesAreOverwrittenWhenForceFlagIsSet()
             "title: 'Test Post'",
             file_get_contents(Hyde::path('_posts/test-post.md'))
         );
-
-        Filesystem::unlink('_posts/test-post.md');
     }
 
     public function testThatTitleCanBeSpecifiedInCommandSignature()
     {
+        $this->cleanUpWhenDone('_posts/test-post.md');
         $this->artisan('make:post "Test Post"')
             ->expectsOutputToContain('Selected title: Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
@@ -104,8 +99,6 @@ public function testThatTitleCanBeSpecifiedInCommandSignature()
             ->expectsConfirmation('Do you wish to continue?', 'yes')
 
             ->assertExitCode(0);
-
-        Filesystem::unlink('_posts/test-post.md');
     }
 
     public function testThatCommandCanBeCanceled()

From d8017ac77b244998a206b25e6aeeb4dae156945e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:32:28 +0200
Subject: [PATCH 17/24] Normalize whitespace formatting

---
 .../Feature/Commands/MakePostCommandTest.php  | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
index d7064691f4e..56b03bf5763 100644
--- a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
@@ -25,19 +25,17 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
             ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsOutput('Creating a post with the following details:')
-
             ->expectsOutput('Title: Test Post')
             ->expectsOutput('Description: A short description')
             ->expectsOutput('Category: general')
             ->expectsOutput('Author: PHPUnit')
             ->expectsOutputToContain('Date: '.date('Y-m-d')) // Don't check min/sec to avoid flaky tests
             ->expectsOutput('Identifier: test-post')
-
             ->expectsConfirmation('Do you wish to continue?', 'yes')
-
             ->assertExitCode(0);
 
         $this->assertFileExists(Hyde::path('_posts/test-post.md'));
+
         $this->assertStringContainsString(
             "title: 'Test Post'",
             file_get_contents(Hyde::path('_posts/test-post.md'))
@@ -53,10 +51,8 @@ public function testThatFilesAreNotOverwrittenWhenForceFlagIsNotSet()
             ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsOutput('Creating a post with the following details:')
-
             ->expectsConfirmation('Do you wish to continue?', 'yes')
             ->expectsOutput('If you want to overwrite the file supply the --force flag.')
-
             ->assertExitCode(409);
 
         $this->assertStringContainsString(
@@ -68,6 +64,7 @@ public function testThatFilesAreNotOverwrittenWhenForceFlagIsNotSet()
     public function testThatFilesAreOverwrittenWhenForceFlagIsSet()
     {
         $this->file('_posts/test-post.md', 'This should be overwritten');
+
         $this->artisan('make:post --force')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
@@ -75,13 +72,13 @@ public function testThatFilesAreOverwrittenWhenForceFlagIsSet()
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsOutput('Creating a post with the following details:')
             ->expectsConfirmation('Do you wish to continue?', 'yes')
-
             ->assertExitCode(0);
 
         $this->assertStringNotContainsString(
             'This should be overwritten',
             file_get_contents(Hyde::path('_posts/test-post.md'))
         );
+
         $this->assertStringContainsString(
             "title: 'Test Post'",
             file_get_contents(Hyde::path('_posts/test-post.md'))
@@ -91,26 +88,26 @@ public function testThatFilesAreOverwrittenWhenForceFlagIsSet()
     public function testThatTitleCanBeSpecifiedInCommandSignature()
     {
         $this->cleanUpWhenDone('_posts/test-post.md');
+
         $this->artisan('make:post "Test Post"')
             ->expectsOutputToContain('Selected title: Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
             ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsConfirmation('Do you wish to continue?', 'yes')
-
             ->assertExitCode(0);
     }
 
     public function testThatCommandCanBeCanceled()
     {
         $this->artisan('make:post "Test Post"')
-        ->expectsOutputToContain('Selected title: Test Post')
-        ->expectsQuestion('Write a short post excerpt/description', 'A short description')
-        ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
-        ->expectsQuestion('What is the primary category of the post?', 'general')
-        ->expectsConfirmation('Do you wish to continue?')
-        ->expectsOutput('Aborting.')
-        ->assertExitCode(130);
+            ->expectsOutputToContain('Selected title: Test Post')
+            ->expectsQuestion('Write a short post excerpt/description', 'A short description')
+            ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
+            ->expectsQuestion('What is the primary category of the post?', 'general')
+            ->expectsConfirmation('Do you wish to continue?')
+            ->expectsOutput('Aborting.')
+            ->assertExitCode(130);
 
         $this->assertFileDoesNotExist(Hyde::path('_posts/test-post.md'));
     }

From 468c8ec29e7b3e800b84b5393eacc5408a491710 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:33:46 +0200
Subject: [PATCH 18/24] Replace substring check with faking the Carbon time

---
 .../framework/tests/Feature/Commands/MakePostCommandTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
index 56b03bf5763..fcf893f57c0 100644
--- a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Carbon;
 
 /**
  * @covers \Hyde\Console\Commands\MakePostCommand
@@ -19,6 +20,8 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
         $this->assertFileDoesNotExist(Hyde::path('_posts/test-post.md'));
         $this->cleanUpWhenDone('_posts/test-post.md');
 
+        Carbon::setTestNow(Carbon::create(2024));
+
         $this->artisan('make:post')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
@@ -29,7 +32,7 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
             ->expectsOutput('Description: A short description')
             ->expectsOutput('Category: general')
             ->expectsOutput('Author: PHPUnit')
-            ->expectsOutputToContain('Date: '.date('Y-m-d')) // Don't check min/sec to avoid flaky tests
+            ->expectsOutput('Date: 2024-01-01 00:00')
             ->expectsOutput('Identifier: test-post')
             ->expectsConfirmation('Do you wish to continue?', 'yes')
             ->assertExitCode(0);

From 07ae03d4e378a8de5218f40836b0fac8f66326d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:35:50 +0200
Subject: [PATCH 19/24] Assert against the entire contents of the file

---
 .../Feature/Commands/MakePostCommandTest.php     | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
index fcf893f57c0..e336694039c 100644
--- a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
@@ -39,9 +39,19 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
 
         $this->assertFileExists(Hyde::path('_posts/test-post.md'));
 
-        $this->assertStringContainsString(
-            "title: 'Test Post'",
-            file_get_contents(Hyde::path('_posts/test-post.md'))
+        $this->assertFileEqualsString(<<<'MARKDOWN'
+            ---
+            title: 'Test Post'
+            description: 'A short description'
+            category: general
+            author: PHPUnit
+            date: '2024-01-01 00:00'
+            ---
+            
+            ## Write something awesome.
+            
+            MARKDOWN,
+            Hyde::path('_posts/test-post.md')
         );
     }
 

From 8117c243b542664c4c032d3040af95ef0e01da7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:37:48 +0200
Subject: [PATCH 20/24] Improve and update mock data

---
 .../Feature/Commands/MakePostCommandTest.php  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
index e336694039c..a7b3e1480dc 100644
--- a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
@@ -20,19 +20,19 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
         $this->assertFileDoesNotExist(Hyde::path('_posts/test-post.md'));
         $this->cleanUpWhenDone('_posts/test-post.md');
 
-        Carbon::setTestNow(Carbon::create(2024));
+        Carbon::setTestNow(Carbon::create(2024, hour: 12));
 
         $this->artisan('make:post')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
-            ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
+            ->expectsQuestion('What is your (the author\'s) name?', 'Mr Hyde')
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsOutput('Creating a post with the following details:')
             ->expectsOutput('Title: Test Post')
             ->expectsOutput('Description: A short description')
             ->expectsOutput('Category: general')
-            ->expectsOutput('Author: PHPUnit')
-            ->expectsOutput('Date: 2024-01-01 00:00')
+            ->expectsOutput('Author: Mr Hyde')
+            ->expectsOutput('Date: 2024-01-01 12:00')
             ->expectsOutput('Identifier: test-post')
             ->expectsConfirmation('Do you wish to continue?', 'yes')
             ->assertExitCode(0);
@@ -44,8 +44,8 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
             title: 'Test Post'
             description: 'A short description'
             category: general
-            author: PHPUnit
-            date: '2024-01-01 00:00'
+            author: 'Mr Hyde'
+            date: '2024-01-01 12:00'
             ---
             
             ## Write something awesome.
@@ -61,7 +61,7 @@ public function testThatFilesAreNotOverwrittenWhenForceFlagIsNotSet()
         $this->artisan('make:post')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
-            ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
+            ->expectsQuestion('What is your (the author\'s) name?', 'Mr Hyde')
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsOutput('Creating a post with the following details:')
             ->expectsConfirmation('Do you wish to continue?', 'yes')
@@ -81,7 +81,7 @@ public function testThatFilesAreOverwrittenWhenForceFlagIsSet()
         $this->artisan('make:post --force')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
-            ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
+            ->expectsQuestion('What is your (the author\'s) name?', 'Mr Hyde')
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsOutput('Creating a post with the following details:')
             ->expectsConfirmation('Do you wish to continue?', 'yes')
@@ -105,7 +105,7 @@ public function testThatTitleCanBeSpecifiedInCommandSignature()
         $this->artisan('make:post "Test Post"')
             ->expectsOutputToContain('Selected title: Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
-            ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
+            ->expectsQuestion('What is your (the author\'s) name?', 'Mr Hyde')
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsConfirmation('Do you wish to continue?', 'yes')
             ->assertExitCode(0);
@@ -116,7 +116,7 @@ public function testThatCommandCanBeCanceled()
         $this->artisan('make:post "Test Post"')
             ->expectsOutputToContain('Selected title: Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')
-            ->expectsQuestion('What is your (the author\'s) name?', 'PHPUnit')
+            ->expectsQuestion('What is your (the author\'s) name?', 'Mr Hyde')
             ->expectsQuestion('What is the primary category of the post?', 'general')
             ->expectsConfirmation('Do you wish to continue?')
             ->expectsOutput('Aborting.')

From 45a517540dd5665cd6eb9e1bf7e3ab2077f92f94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:38:08 +0200
Subject: [PATCH 21/24] Normalize file formatting

---
 .../framework/tests/Feature/Commands/MakePostCommandTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
index a7b3e1480dc..e94b3a53a4a 100644
--- a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
@@ -58,6 +58,7 @@ public function testCommandHasExpectedOutputAndCreatesValidFile()
     public function testThatFilesAreNotOverwrittenWhenForceFlagIsNotSet()
     {
         $this->file('_posts/test-post.md', 'This should not be overwritten');
+
         $this->artisan('make:post')
             ->expectsQuestion('What is the title of the post?', 'Test Post')
             ->expectsQuestion('Write a short post excerpt/description', 'A short description')

From d661a68784306721d9ad1fb4f7f6172e5eca1861 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:38:48 +0200
Subject: [PATCH 22/24] Update year used in file

---
 tests/Browser/HighLevelViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Browser/HighLevelViewTest.php b/tests/Browser/HighLevelViewTest.php
index 9cfcaf9c155..b32db6c6e44 100644
--- a/tests/Browser/HighLevelViewTest.php
+++ b/tests/Browser/HighLevelViewTest.php
@@ -95,7 +95,7 @@ public function testPostsHomepageWithPosts()
 description: A short description used in previews and SEO
 category: blog
 author: Mr. Hyde
-date: 2022-01-01 12:00
+date: 2024-01-01 12:00
 ---
 ## Write something awesome.
 

From 71ef79b8155f8c9af56354a9a8c6a56543afec11 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:39:41 +0200
Subject: [PATCH 23/24] Revert "Update year used in file"

This reverts commit d661a68784306721d9ad1fb4f7f6172e5eca1861.
---
 tests/Browser/HighLevelViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Browser/HighLevelViewTest.php b/tests/Browser/HighLevelViewTest.php
index b32db6c6e44..9cfcaf9c155 100644
--- a/tests/Browser/HighLevelViewTest.php
+++ b/tests/Browser/HighLevelViewTest.php
@@ -95,7 +95,7 @@ public function testPostsHomepageWithPosts()
 description: A short description used in previews and SEO
 category: blog
 author: Mr. Hyde
-date: 2024-01-01 12:00
+date: 2022-01-01 12:00
 ---
 ## Write something awesome.
 

From 02393f353f0d650a18263471e4e0e4115ef511a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Jul 2024 20:40:56 +0200
Subject: [PATCH 24/24] Use fault tolerant file memory helper

---
 .../framework/tests/Unit/GetLatestMarkdownPostsTest.php  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php b/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
index d82edd83e49..c19ca4323ba 100644
--- a/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
+++ b/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Facades\Filesystem;
-use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
@@ -17,8 +15,8 @@ class GetLatestMarkdownPostsTest extends TestCase
 {
     public function testMarkdownPageGetLatestHelperReturnsSortedMarkdownPageCollection()
     {
-        file_put_contents(Hyde::path('_posts/new.md'), "---\ndate: '2022-01-01 12:00'\n---\n");
-        file_put_contents(Hyde::path('_posts/old.md'), "---\ndate: '2021-01-01 12:00'\n---\n");
+        $this->file('_posts/new.md', "---\ndate: '2022-01-01 12:00'\n---\n");
+        $this->file('_posts/old.md', "---\ndate: '2021-01-01 12:00'\n---\n");
 
         $collection = MarkdownPost::getLatestPosts();
 
@@ -28,8 +26,5 @@ public function testMarkdownPageGetLatestHelperReturnsSortedMarkdownPageCollecti
 
         $this->assertSame('new', $collection->first()->identifier);
         $this->assertSame('old', $collection->last()->identifier);
-
-        Filesystem::unlink('_posts/new.md');
-        Filesystem::unlink('_posts/old.md');
     }
 }