Merge pull request #2294 from hydephp/fix/vite-test-issues

Improve Vite running detection on Windows

Author: emmadesilva

packages/framework/src/Console/Commands/ServeCommand.php

@@ -70,6 +70,10 @@ public function safeHandle(): int
 
         $this->handleRunningProcesses();
 
+        if ($this->option('vite')) {
+            $this->cleanupViteHotFile();
+        }
+
         return Command::SUCCESS;
     }
 
@@ -220,13 +224,26 @@ protected function handleViteOutput(): void
     /** @experimental This feature may be removed before the final release. */
     protected function isPortAvailable(int $port): bool
     {
-        $socket = @fsockopen('localhost', $port, $errno, $errstr, 1);
-        if ($socket !== false) {
-            fclose($socket);
+        $addresses = ['localhost', '127.0.0.1'];
 
-            return false;
+        foreach ($addresses as $address) {
+            $socket = @fsockopen($address, $port, $errno, $errstr, 1);
+            if ($socket !== false) {
+                fclose($socket);
+
+                return false;
+            }
         }
 
         return true;
     }
+
+    protected function cleanupViteHotFile(): void
+    {
+        $hotFile = 'app/storage/framework/runtime/vite.hot';
+
+        if (Filesystem::exists($hotFile)) {
+            Filesystem::unlinkIfExists($hotFile);
+        }
+    }
 }

packages/framework/tests/Feature/Commands/ServeCommandTest.php

@@ -226,7 +226,7 @@ public function testHydeServeCommandWithViteOption()
             ->expectsOutput('vite latest output')
             ->assertExitCode(0);
 
-        $this->assertFileExists('app/storage/framework/runtime/vite.hot');
+        $this->assertFileDoesNotExist('app/storage/framework/runtime/vite.hot');
     }
 
     public function testHydeServeCommandWithViteOptionButViteNotRunning()
@@ -269,18 +269,24 @@ public function testHydeServeCommandWithViteOptionButViteNotRunning()
             ->expectsOutput('Starting the HydeRC server... Use Ctrl+C to stop')
             ->assertExitCode(0);
 
-        $this->assertFileExists('app/storage/framework/runtime/vite.hot');
+        $this->assertFileDoesNotExist('app/storage/framework/runtime/vite.hot');
     }
 
     public function testHydeServeCommandWithViteOptionThrowsWhenPortIsInUse()
     {
-        $socket = stream_socket_server('tcp://127.0.0.1:5173');
-
-        $this->artisan('serve --vite')
-            ->expectsOutputToContain('Unable to start Vite server: Port 5173 is already in use')
-            ->assertExitCode(1);
-
-        stream_socket_shutdown($socket, STREAM_SHUT_RDWR);
+        $socket = stream_socket_server('tcp://127.0.0.1:5173', $errno, $errstr);
+
+        if ($socket === false) {
+            $this->markTestSkipped("Unable to create test socket server: $errstr (errno: $errno)");
+        }
+
+        try {
+            $this->artisan('serve --vite')
+                ->expectsOutputToContain('Unable to start Vite server: Port 5173 is already in use')
+                ->assertExitCode(1);
+        } finally {
+            stream_socket_shutdown($socket, STREAM_SHUT_RDWR);
+        }
     }
 
     protected function binaryPath(): string

packages/framework/tests/Feature/Views/MetadataViewTest.php

@@ -26,6 +26,8 @@ protected function setUp(): void
 
         $this->withSiteUrl();
         config(['hyde.cache_busting' => false]);
+
+        @unlink('app/storage/framework/runtime/vite.hot');
     }
 
     protected function build(?string $page = null): void