diff --git a/src/app/Console/Commands/Domain/SetStatusCommand.php b/src/app/Console/Commands/Domain/SetStatusCommand.php index a51d1a83..309b86cb 100644 --- a/src/app/Console/Commands/Domain/SetStatusCommand.php +++ b/src/app/Console/Commands/Domain/SetStatusCommand.php @@ -1,45 +1,42 @@ getDomain($this->argument('domain')); if (!$domain) { $this->error("Domain not found."); 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 index 5f03affe..c7a71d97 100644 --- a/src/app/Console/Commands/Domain/SetWalletCommand.php +++ b/src/app/Console/Commands/Domain/SetWalletCommand.php @@ -1,71 +1,68 @@ getDomain($this->argument('domain')); if (!$domain) { $this->error("Domain not found."); return 1; } $wallet = $this->getWallet($this->argument('wallet')); if (!$wallet) { $this->error("Wallet not found."); return 1; } if ($entitlement = $domain->entitlements()->first()) { $this->error("Domain already assigned to a wallet: {$entitlement->wallet_id}."); return 1; } if ($p = $this->option('package')) { $package = Package::withObjectTenantContext($domain)->find($p); if (!$package) { $package = Package::withObjectTenantContext($domain)->where('title', $p)->first(); } } else { $package = Package::withObjectTenantContext($domain)->where('title', 'domain-hosting')->first(); } if (!$package) { $this->error("Package not found."); 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 index d6fc3707..c6dd145d 100644 --- a/src/tests/Feature/Console/Domain/SetStatusTest.php +++ b/src/tests/Feature/Console/Domain/SetStatusTest.php @@ -1,57 +1,58 @@ deleteTestDomain('domain-delete.com'); } /** * {@inheritDoc} */ public function tearDown(): void { $this->deleteTestDomain('domain-delete.com'); parent::tearDown(); } /** * Test the command */ public function testHandle(): void { - Queue::fake(); - // Non-existing domain $code = \Artisan::call("domain:set-status unknown.org 1"); $output = trim(\Artisan::output()); $this->assertSame(1, $code); $this->assertSame("Domain not found.", $output); $domain = $this->getTestDomain('domain-delete.com', [ 'status' => \App\Domain::STATUS_NEW, '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(); $this->assertSame(\App\Domain::STATUS_LDAP_READY, $domain->status); } }