Test Improvements (#371)

* Test Improvements

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* Apply fixes from StyleCI

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* Apply fixes from StyleCI

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>
Co-authored-by: StyleCI Bot <[email protected]>

Author: crynobone

src/Concerns/InteractsWithHerdOrValet.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Laravel\Installer\Console\Concerns;
+
+use Symfony\Component\Process\Exception\ProcessStartFailedException;
+use Symfony\Component\Process\Process;
+
+trait InteractsWithHerdOrValet
+{
+    /**
+     * Determine if the given directory is parked using Herd or Valet.
+     *
+     * @param  string  $directory
+     * @return bool
+     */
+    public function isParkedOnHerdOrValet(string $directory)
+    {
+        $output = $this->runOnValetOrHerd('paths');
+
+        return $output !== false ? in_array(dirname($directory), json_decode($output)) : false;
+    }
+
+    /**
+     * Runs the given command on the "herd" or "valet" CLI.
+     *
+     * @param  string  $command
+     * @return string|false
+     */
+    protected function runOnValetOrHerd(string $command)
+    {
+        foreach (['herd', 'valet'] as $tool) {
+            $process = new Process([$tool, $command, '-v']);
+
+            try {
+                $process->run();
+
+                if ($process->isSuccessful()) {
+                    return trim($process->getOutput());
+                }
+            } catch (ProcessStartFailedException) {
+            }
+        }
+
+        return false;
+    }
+}

src/NewCommand.php

@@ -11,7 +11,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Process\Exception\ProcessStartFailedException;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 
@@ -23,6 +22,7 @@
 class NewCommand extends Command
 {
     use Concerns\ConfiguresPrompts;
+    use Concerns\InteractsWithHerdOrValet;
 
     /**
      * The Composer instance.
@@ -247,7 +247,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln('<fg=gray>➜</> <options=bold>cd '.$name.'</>');
             $output->writeln('<fg=gray>➜</> <options=bold>npm install && npm run build</>');
 
-            if ($this->isParked($directory)) {
+            if ($this->isParkedOnHerdOrValet($directory)) {
                 $url = $this->generateAppUrl($name);
                 $output->writeln('<fg=gray>➜</> Open: <options=bold;href='.$url.'>'.$url.'</>');
             } else {
@@ -827,19 +827,6 @@ protected function canResolveHostname($hostname)
         return gethostbyname($hostname.'.') !== $hostname.'.';
     }
 
-    /**
-     * Determine if the given directory is parked using Herd or Valet.
-     *
-     * @param  string  $directory
-     * @return bool
-     */
-    protected function isParked(string $directory)
-    {
-        $output = $this->runOnValetOrHerd('paths');
-
-        return $output !== false ? in_array(dirname($directory), json_decode($output)) : false;
-    }
-
     /**
      * Get the installation directory.
      *
@@ -892,30 +879,6 @@ protected function phpBinary()
             : 'php';
     }
 
-    /**
-     * Runs the given command on the "herd" or "valet" CLI.
-     *
-     * @param  string  $command
-     * @return string|bool
-     */
-    protected function runOnValetOrHerd(string $command)
-    {
-        foreach (['herd', 'valet'] as $tool) {
-            $process = new Process([$tool, $command, '-v']);
-
-            try {
-                $process->run();
-
-                if ($process->isSuccessful()) {
-                    return trim($process->getOutput());
-                }
-            } catch (ProcessStartFailedException) {
-            }
-        }
-
-        return false;
-    }
-
     /**
      * Run the given commands.
      *

tests/NewCommandTest.php

@@ -2,13 +2,16 @@
 
 namespace Laravel\Installer\Console\Tests;
 
+use Laravel\Installer\Console\Concerns\InteractsWithHerdOrValet;
 use Laravel\Installer\Console\NewCommand;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
 class NewCommandTest extends TestCase
 {
+    use InteractsWithHerdOrValet;
+
     public function test_it_can_scaffold_a_new_laravel_app()
     {
         $scaffoldDirectoryName = 'tests-output/my-app';
@@ -36,6 +39,10 @@ public function test_it_can_scaffold_a_new_laravel_app()
 
     public function test_it_can_chops_trailing_slash_from_name()
     {
+        if ($this->runOnValetOrHerd('paths') === false) {
+            $this->markTestSkipped('Require `herd` or `valet` to resolve `APP_URL` using hostname instead of "localhost".');
+        }
+
         $scaffoldDirectoryName = 'tests-output/trailing/';
         $scaffoldDirectory = __DIR__.'/../'.$scaffoldDirectoryName;
 
@@ -57,7 +64,13 @@ public function test_it_can_chops_trailing_slash_from_name()
         $this->assertSame(0, $statusCode);
         $this->assertDirectoryExists($scaffoldDirectory.'/vendor');
         $this->assertFileExists($scaffoldDirectory.'/.env');
-        $this->assertStringContainsStringIgnoringLineEndings('APP_URL=http://tests-output/trailing.test', file_get_contents($scaffoldDirectory.'/.env'));
+
+        if ($this->isParkedOnHerdOrValet($scaffoldDirectory)) {
+            $this->assertStringContainsStringIgnoringLineEndings(
+                'APP_URL=http://tests-output/trailing.test',
+                file_get_contents($scaffoldDirectory.'/.env')
+            );
+        }
     }
 
     public function test_on_at_least_laravel_11()