fix option on command

asciito · Oct 23, 2023 · c19c958 · c19c958
1 parent e18c204
commit c19c958
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/app/Commands/DriverManagerCommand.php b/app/Commands/DriverManagerCommand.php
@@ -34,8 +34,8 @@ class DriverManagerCommand extends Command
     ];
 
     protected array $commands = [
-        'start' => './chromedriver --log-level=ALL --port {port} &',
-        'pid' => "ps aux | grep '[c]hromedriver --log-level=ALL {options}' | awk '{print $2,$14}'",
+        'start' => './chromedriver --log-level=ALL --port={port} &',
+        'pid' => "ps aux | grep '[c]hromedriver --log-level=ALL {options}' | awk '{print $2,$13}'",
         'stop' => 'kill -9 {pid}',
     ];
 
@@ -46,6 +46,7 @@ public function handle(): int
             'stop' => 'Stop a server',
             'restart' => 'Restart a server',
             'status' => 'Status of a server',
+            'list' => 'List all the server available in the system',
             'kill' => 'Kill all the servers available in the system',
         ]);
 
@@ -207,7 +208,7 @@ protected function command(string $cmd, array $with)
 
     protected function getProcessID(string $port): ?int
     {
-        $process = $this->command('pid', ['{options}' => '--port '.$port]);
+        $process = $this->command('pid', ['{options}' => '--port='.$port]);
 
         $output = explode(' ', trim($process->output()));
 
@@ -216,7 +217,7 @@ protected function getProcessID(string $port): ?int
 
     protected function getProcessIDs(): ?Collection
     {
-        $process = $this->command('pid', ['{pid}' => '']);
+        $process = $this->command('pid', ['{options}' => '']);
 
         if (empty($process->output())) {
             return null;
@@ -227,7 +228,7 @@ protected function getProcessIDs(): ?Collection
         return collect($raw)->map(function (string $data) {
             $data = explode(' ', $data);
 
-            return ['pid' => $data[0], 'port' => $data[1]];
+            return ['pid' => $data[0], 'port' => Str::remove('--port=', $data[1])];
         });
     }
 

diff --git a/tests/Feature/ManageDriverCommandTest.php b/tests/Feature/ManageDriverCommandTest.php
@@ -17,7 +17,7 @@
         ->expectsOutputToContain('Google Chrome Driver server is up and running')
         ->assertSuccessful();
 
-    Process::assertRan('./chromedriver --log-level=ALL --port 9515 &');
+    Process::assertRan('./chromedriver --log-level=ALL --port=9515 &');
 });
 
 it('stop a Chrome Driver server', function () {
@@ -32,7 +32,7 @@
         ->doesntExpectOutputToContain("There's no server to stop on port [9515]")
         ->assertSuccessful();
 
-    Process::assertRan("ps aux | grep '[c]hromedriver --log-level=ALL --port 9515' | awk '{print $2,$14}'");
+    Process::assertRan("ps aux | grep '[c]hromedriver --log-level=ALL --port=9515' | awk '{print $2,$13}'");
 
     Process::assertRan('kill -9 10101');
 });
@@ -49,11 +49,11 @@
         ->doesntExpectOutputToContain("There's no server to restart on port [9515]")
         ->assertSuccessful();
 
-    Process::assertRan("ps aux | grep '[c]hromedriver --log-level=ALL --port 9515' | awk '{print $2,$14}'");
+    Process::assertRan("ps aux | grep '[c]hromedriver --log-level=ALL --port=9515' | awk '{print $2,$13}'");
 
     Process::assertRan('kill -9 10101');
 
-    Process::assertRan('./chromedriver --log-level=ALL --port 9515 &');
+    Process::assertRan('./chromedriver --log-level=ALL --port=9515 &');
 });
 
 test('status of Chrome Driver server', function () {
@@ -115,7 +115,7 @@
     artisan('manage:driver', ['action' => 'start', '-p' => [9515, 9516, 9517, 9518]])
         ->assertSuccessful();
 
-    Process::assertRanTimes(fn (PendingProcess $process) => Str::match('/^\.\/chromedriver --log-level=ALL --port \d+ &$/', $process->command), 4);
+    Process::assertRanTimes(fn (PendingProcess $process) => Str::match('/^\.\/chromedriver --log-level=ALL --port=\d+ &$/', $process->command), 4);
 });
 
 it('stop all the available Chrome Driver servers', function () {