diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index cf7672174e5b..3517aa717765 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -336,7 +336,7 @@ class Import implements ShouldQueue $data = $this->transformCompanyData($data); - if(Ninja::isHosted() && strlen($data['subdomain']) > 1) { + if(Ninja::isHosted()) { if(!MultiDB::checkDomainAvailable($data['subdomain'])) $data['subdomain'] = MultiDB::randomSubdomainGenerator(); diff --git a/tests/Feature/TaskStatusApiTest.php b/tests/Feature/TaskStatusApiTest.php index 09f8e0a418c1..6a691c4a847b 100644 --- a/tests/Feature/TaskStatusApiTest.php +++ b/tests/Feature/TaskStatusApiTest.php @@ -125,9 +125,9 @@ class TaskStatusApiTest extends TestCase public function testTaskStatusDeletedFromDELETEROute() { - $data = [ - 'ids' => [$this->encodePrimaryKey($this->task_status->id)], - ]; + // $data = [ + // 'ids' => [$this->encodePrimaryKey($this->task_status->id)], + // ]; $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), @@ -135,7 +135,8 @@ class TaskStatusApiTest extends TestCase ])->delete('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id)); $arr = $response->json(); -nlog($arr); +// nlog($arr); + $this->assertTrue($arr['data']['is_deleted']); }