Test fixes

Author: simonhamp

tests/Fakes/FakeChildProcessTest.php

@@ -82,18 +82,18 @@
     $fake->php('cmdA', 'aliasA', ['envA'], true);
     $fake->php('cmdB', 'aliasB', ['envB'], false);
 
-    $fake->assertPhp(fn ($cmd, $alias, $env, $persistent) => $alias === 'aliasA' &&
+    $fake->assertPhp(fn ($cmd, $alias, $env, $persistent, $iniSettings) => $alias === 'aliasA' &&
         $cmd === 'cmdA' &&
         $env === ['envA'] &&
         $persistent === true);
 
-    $fake->assertPhp(fn ($cmd, $alias, $env, $persistent) => $alias === 'aliasB' &&
+    $fake->assertPhp(fn ($cmd, $alias, $env, $persistent, $iniSettings) => $alias === 'aliasB' &&
         $cmd === 'cmdB' &&
         $env === ['envB'] &&
         $persistent === false);
 
     try {
-        $fake->assertPhp(fn ($cmd, $alias, $env, $persistent) => $alias === 'aliasC');
+        $fake->assertPhp(fn ($cmd, $alias, $env, $persistent, $iniSettings) => $alias === 'aliasC');
     } catch (AssertionFailedError) {
         return;
     }
@@ -107,18 +107,18 @@
     $fake->artisan('cmdA', 'aliasA', ['envA'], true);
     $fake->artisan('cmdB', 'aliasB', ['envB'], false);
 
-    $fake->assertArtisan(fn ($cmd, $alias, $env, $persistent) => $alias === 'aliasA' &&
+    $fake->assertArtisan(fn ($cmd, $alias, $env, $persistent, $iniSettings) => $alias === 'aliasA' &&
         $cmd === 'cmdA' &&
         $env === ['envA'] &&
         $persistent === true);
 
-    $fake->assertArtisan(fn ($cmd, $alias, $env, $persistent) => $alias === 'aliasB' &&
+    $fake->assertArtisan(fn ($cmd, $alias, $env, $persistent, $iniSettings) => $alias === 'aliasB' &&
         $cmd === 'cmdB' &&
         $env === ['envB'] &&
         $persistent === false);
 
     try {
-        $fake->assertArtisan(fn ($cmd, $alias, $env, $persistent) => $alias === 'aliasC');
+        $fake->assertArtisan(fn ($cmd, $alias, $env, $persistent, $iniSettings) => $alias === 'aliasC');
     } catch (AssertionFailedError) {
         return;
     }

tests/QueueWorker/QueueWorkerTest.php

@@ -6,23 +6,27 @@
 
 it('hits the child process with relevant queue config to spin up a new queue worker', function () {
     ChildProcess::fake();
-    $config = new QueueConfig('some_worker', ['default'], 128, 61);
+
+    $workerName = 'some_worker';
+
+    $config = new QueueConfig($workerName, ['default'], 128, 61);
 
     QueueWorker::up($config);
 
-    ChildProcess::assertPhp(function (array $cmd, string $alias, $env, $persistent) {
+    ChildProcess::assertArtisan(function (array $cmd, string $alias, $env, $persistent, $iniSettings) use ($workerName) {
         expect($cmd)->toBe([
-            '-d',
-            'memory_limit=128M',
-            'artisan',
             'queue:work',
-            "--name={$alias}",
+            "--name={$workerName}",
             '--queue=default',
             '--memory=128',
             '--timeout=61',
         ]);
 
-        expect($alias)->toBe('some_worker');
+        expect($iniSettings)->toBe([
+            'memory_limit' => '128M',
+        ]);
+
+        expect($alias)->toBe('queue_some_worker');
         expect($env)->toBeNull();
         expect($persistent)->toBeTrue();
 
@@ -35,5 +39,5 @@
 
     QueueWorker::down('some_worker');
 
-    ChildProcess::assertStop('some_worker');
+    ChildProcess::assertStop('queue_some_worker');
 });