Merge pull request #361 from eliashaeussler/task/windows-tests

[TASK] Run tests for Windows and macOS as well
eliashaeussler · Jun 21, 2024 · e505421 · e505421
2 parents ce0e2bd + 88258ad
commit e505421
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 21 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -10,13 +10,21 @@ on:
 
 jobs:
   tests:
-    name: Tests (PHP ${{ matrix.php-version }} & ${{ matrix.dependencies }} dependencies)
-    runs-on: ubuntu-latest
+    name: Tests (PHP ${{ matrix.php-version }}, ${{ matrix.os }} & ${{ matrix.dependencies }} dependencies)
+    runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
       matrix:
         php-version: ["8.1", "8.2", "8.3"]
         dependencies: ["locked", "highest", "lowest"]
+        os: ["Ubuntu"]
+        include:
+          - php-version: "8.3"
+            dependencies: "highest"
+            os: "macOS"
+          - php-version: "8.3"
+            dependencies: "highest"
+            os: "Windows"
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/tests/unit/Crawler/OutputtingCrawlerTest.php b/tests/unit/Crawler/OutputtingCrawlerTest.php
@@ -215,8 +215,8 @@ public function crawlWritesCrawlingStateAsProgressBarToOutput(): void
         $output = $this->output->fetch();
 
         self::assertNotEmpty($output);
-        self::assertMatchesRegularExpression('#^\s*1/2 \S+\s+\d+% -- no failures$#m', $output);
-        self::assertMatchesRegularExpression('#^\s*2/2 \S+\s+\d+% -- 1 failure$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*1/2 \S+\s+\d+% -- no failures#m', $output);
+        self::assertMatchesRegularExpression('#^\s*2/2 \S+\s+\d+% -- 1 failure#m', $output);
     }
 
     #[Framework\Attributes\Test]

diff --git a/tests/unit/Helper/FilesystemHelperTest.php b/tests/unit/Helper/FilesystemHelperTest.php
@@ -49,7 +49,7 @@ public function resolveRelativePathPrependsProjectRootPath(): void
     {
         $currentWorkingDirectory = getcwd();
         $projectRootPath = __DIR__.'/..';
-        $expected = dirname(__DIR__).'/foo/baz';
+        $expected = Src\Helper\FilesystemHelper::joinPathSegments(dirname(__DIR__).'/foo/baz');
 
         self::assertNotFalse($currentWorkingDirectory, 'Unable to get current working directory.');
 

diff --git a/tests/unit/Http/Message/Handler/CompactProgressHandlerTest.php b/tests/unit/Http/Message/Handler/CompactProgressHandlerTest.php
@@ -55,7 +55,7 @@ public function startProgressBarStartsProgressBar(): void
         $output = $this->output->fetch();
 
         self::assertNotEmpty($output);
-        self::assertMatchesRegularExpression('#^\s*0/10 \S+\s+0% -- no failures$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*0/10 \S+\s+0% -- no failures#m', $output);
     }
 
     #[Framework\Attributes\Test]
@@ -67,8 +67,8 @@ public function finishProgressBarFinishesProgressBar(): void
         $output = $this->output->fetch();
 
         self::assertNotEmpty($output);
-        self::assertMatchesRegularExpression('#^\s*0/10 \S+\s+0% -- no failures$#m', $output);
-        self::assertMatchesRegularExpression('#^\s*10/10 \S+\s+100% -- no failures$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*0/10 \S+\s+0% -- no failures#m', $output);
+        self::assertMatchesRegularExpression('#^\s*10/10 \S+\s+100% -- no failures#m', $output);
     }
 
     #[Framework\Attributes\Test]
@@ -83,7 +83,7 @@ public function onSuccessPrintsSuccessfulUrlAndAdvancesProgressBarByOneStep(): v
         $output = $this->output->fetch();
 
         self::assertNotEmpty($output);
-        self::assertMatchesRegularExpression('#^\s*1/10 \S+\s+10% -- no failures$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*1/10 \S+\s+10% -- no failures#m', $output);
     }
 
     #[Framework\Attributes\Test]
@@ -99,7 +99,7 @@ public function onFailurePrintsFailedUrlAndAdvancesProgressBarByOneStep(): void
         $output = $this->output->fetch();
 
         self::assertNotEmpty($output);
-        self::assertMatchesRegularExpression('#^\s*1/10 \S+\s+10% -- 1 failure$#m', $output);
-        self::assertMatchesRegularExpression('#^\s*2/10 \S+\s+20% -- 2 failures$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*1/10 \S+\s+10% -- 1 failure#m', $output);
+        self::assertMatchesRegularExpression('#^\s*2/10 \S+\s+20% -- 2 failures#m', $output);
     }
 }
diff --git a/tests/unit/Http/Message/Handler/VerboseProgressHandlerTest.php b/tests/unit/Http/Message/Handler/VerboseProgressHandlerTest.php
@@ -55,7 +55,7 @@ public function startProgressBarStartsProgressBar(): void
         $output = $this->output->fetch();
 
         self::assertNotEmpty($output);
-        self::assertMatchesRegularExpression('#^\s*0/10 \S+\s+0%$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*0/10 \S+\s+0%#m', $output);
     }
 
     #[Framework\Attributes\Test]
@@ -67,7 +67,7 @@ public function finishProgressBarFinishesProgressBar(): void
         $output = $this->output->fetch();
 
         self::assertNotEmpty($output);
-        self::assertMatchesRegularExpression('#^\s*10/10 \S+\s+100%$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*10/10 \S+\s+100%#m', $output);
     }
 
     #[Framework\Attributes\Test]
@@ -83,7 +83,7 @@ public function onSuccessPrintsSuccessfulUrlAndAdvancesProgressBarByOneStep(): v
 
         self::assertNotEmpty($output);
         self::assertStringContainsString(' DONE  '.$uri, $output);
-        self::assertMatchesRegularExpression('#^\s*1/10 \S+\s+10%$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*1/10 \S+\s+10%#m', $output);
     }
 
     #[Framework\Attributes\Test]
@@ -99,6 +99,6 @@ public function onFailurePrintsFailedUrlAndAdvancesProgressBarByOneStep(): void
 
         self::assertNotEmpty($output);
         self::assertStringContainsString(' FAIL  '.$uri, $output);
-        self::assertMatchesRegularExpression('#^\s*1/10 \S+\s+10%$#m', $output);
+        self::assertMatchesRegularExpression('#^\s*1/10 \S+\s+10%#m', $output);
     }
 }
diff --git a/tests/unit/Log/FileLoggerTest.php b/tests/unit/Log/FileLoggerTest.php
@@ -26,11 +26,10 @@
 use EliasHaeussler\CacheWarmup as Src;
 use PHPUnit\Framework;
 use Psr\Log;
+use Symfony\Component\Filesystem;
 
 use function dirname;
-use function file_exists;
 use function file_get_contents;
-use function rmdir;
 use function sys_get_temp_dir;
 use function uniqid;
 use function unlink;
@@ -86,9 +85,10 @@ public function logLogsFormattedMessageToLogFile(): void
 
     protected function tearDown(): void
     {
-        if (file_exists($this->logFile)) {
-            unlink($this->logFile);
-            rmdir(dirname($this->logFile));
-        }
+        // Run subject destruction to close log file stream
+        unset($this->subject);
+
+        $filesystem = new Filesystem\Filesystem();
+        $filesystem->remove(dirname($this->logFile));
     }
 }