diff --git a/src/app/Console/Commands/Domain/SetStatusCommand.php b/src/app/Console/Commands/Domain/SetStatusCommand.php --- a/src/app/Console/Commands/Domain/SetStatusCommand.php +++ b/src/app/Console/Commands/Domain/SetStatusCommand.php @@ -3,7 +3,6 @@ namespace App\Console\Commands\Domain; use App\Console\Command; -use Illuminate\Support\Facades\Queue; class SetStatusCommand extends Command { @@ -35,11 +34,9 @@ return 1; } - Queue::fake(); // ignore LDAP for now - $domain->status = (int) $this->argument('status'); $domain->save(); - $this->info((string) $domain->status); + $this->info("Status ({$domain->status}): " . $domain->statusText()); } } diff --git a/src/app/Console/Commands/Domain/SetWalletCommand.php b/src/app/Console/Commands/Domain/SetWalletCommand.php --- a/src/app/Console/Commands/Domain/SetWalletCommand.php +++ b/src/app/Console/Commands/Domain/SetWalletCommand.php @@ -4,7 +4,6 @@ use App\Console\Command; use App\Package; -use Illuminate\Support\Facades\Queue; class SetWalletCommand extends Command { @@ -63,8 +62,6 @@ return 1; } - Queue::fake(); // ignore LDAP for now (note: adding entitlements updates the domain) - // Assign package the same as we do in DomainsController when a new domain is created $domain->assignPackageAndWallet($package, $wallet); } diff --git a/src/tests/Feature/Console/Domain/SetStatusTest.php b/src/tests/Feature/Console/Domain/SetStatusTest.php --- a/src/tests/Feature/Console/Domain/SetStatusTest.php +++ b/src/tests/Feature/Console/Domain/SetStatusTest.php @@ -32,8 +32,6 @@ */ public function testHandle(): void { - Queue::fake(); - // Non-existing domain $code = \Artisan::call("domain:set-status unknown.org 1"); $output = trim(\Artisan::output()); @@ -45,10 +43,13 @@ 'type' => \App\Domain::TYPE_HOSTED, ]); + Queue::fake(); + $code = \Artisan::call("domain:set-status domain-delete.com " . \App\Domain::STATUS_LDAP_READY); $output = trim(\Artisan::output()); $this->assertSame(0, $code); - $this->assertSame((string) \App\Domain::STATUS_LDAP_READY, $output); + $this->assertSame('Status (64): ldapReady (64)', $output); + Queue::assertPushed(\App\Jobs\Domain\UpdateJob::class, 1); $domain->refresh();