A free open source IT asset/license management system
Pint
sniped3f10ee776d6
diff --git a/tests/Feature/Importing/Api/ImportUsersFmcsLocationTest.php b/tests/Feature/Importing/Api/ImportUsersFmcsLocationTest.phpindex 702cd9470c..9ee8fd93ff 100644--- a/tests/Feature/Importing/Api/ImportUsersFmcsLocationTest.php+++ b/tests/Feature/Importing/Api/ImportUsersFmcsLocationTest.php@@ -31,15 +31,15 @@ class ImportUsersFmcsLocationTest extends ImportDataTestCase{$this->settings->enableScopedLocationsWithFullMultipleCompanySupport();- $company = Company::factory()->create();+ $company = Company::factory()->create();$location = Location::factory()->create(['company_id' => $company->id]);$importFileBuilder = ImportFileBuilder::new(['companyName' => $company->name,- 'location' => $location->name,+ 'location' => $location->name,]);- $row = $importFileBuilder->firstRow();+ $row = $importFileBuilder->firstRow();$import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);$this->actingAsForApi(User::factory()->superuser()->create());@@ -57,10 +57,10 @@ class ImportUsersFmcsLocationTest extends ImportDataTestCase$importFileBuilder = ImportFileBuilder::new(['companyName' => $companyA->name,- 'location' => $location->name,+ 'location' => $location->name,]);- $row = $importFileBuilder->firstRow();+ $row = $importFileBuilder->firstRow();$import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);$this->actingAsForApi(User::factory()->superuser()->create());@@ -74,15 +74,15 @@ class ImportUsersFmcsLocationTest extends ImportDataTestCase$this->settings->enableScopedLocationsWithFullMultipleCompanySupport();$this->settings->enableFloaterMode();- $company = Company::factory()->create();+ $company = Company::factory()->create();$location = Location::factory()->create(['company_id' => null]);$importFileBuilder = ImportFileBuilder::new(['companyName' => $company->name,- 'location' => $location->name,+ 'location' => $location->name,]);- $row = $importFileBuilder->firstRow();+ $row = $importFileBuilder->firstRow();$import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);$this->actingAsForApi(User::factory()->superuser()->create());@@ -96,15 +96,15 @@ class ImportUsersFmcsLocationTest extends ImportDataTestCase$this->settings->enableScopedLocationsWithFullMultipleCompanySupport();$this->settings->disableFloaterMode();- $company = Company::factory()->create();+ $company = Company::factory()->create();$location = Location::factory()->create(['company_id' => null]);$importFileBuilder = ImportFileBuilder::new(['companyName' => $company->name,- 'location' => $location->name,+ 'location' => $location->name,]);- $row = $importFileBuilder->firstRow();+ $row = $importFileBuilder->firstRow();$import = Import::factory()->users()->create(['file_path' => $importFileBuilder->saveToImportsDirectory()]);$this->actingAsForApi(User::factory()->superuser()->create());diff --git a/tests/Feature/Users/Ui/FmcsLocationValidationTest.php b/tests/Feature/Users/Ui/FmcsLocationValidationTest.phpindex cf0607062d..8b5a95a2f9 100644--- a/tests/Feature/Users/Ui/FmcsLocationValidationTest.php+++ b/tests/Feature/Users/Ui/FmcsLocationValidationTest.php@@ -23,10 +23,10 @@ class FmcsLocationValidationTest extends TestCaseprivate function basePayload(array $overrides = []): array{return array_merge([- 'first_name' => 'Test',- 'last_name' => 'User',- 'username' => 'fmcs-test-'.uniqid(),- 'password' => 'testpassword1235!!',+ 'first_name' => 'Test',+ 'last_name' => 'User',+ 'username' => 'fmcs-test-'.uniqid(),+ 'password' => 'testpassword1235!!','password_confirmation' => 'testpassword1235!!',], $overrides);}@@ -35,7 +35,7 @@ class FmcsLocationValidationTest extends TestCase{$this->settings->enableScopedLocationsWithFullMultipleCompanySupport();- $company = Company::factory()->create();+ $company = Company::factory()->create();$location = Location::factory()->create(['company_id' => $company->id]);$this->actingAs(User::factory()->superuser()->create())@@ -67,7 +67,7 @@ class FmcsLocationValidationTest extends TestCase$this->settings->enableScopedLocationsWithFullMultipleCompanySupport();$this->settings->enableFloaterMode();- $company = Company::factory()->create();+ $company = Company::factory()->create();$location = Location::factory()->create(['company_id' => null]);$this->actingAs(User::factory()->superuser()->create())@@ -84,7 +84,7 @@ class FmcsLocationValidationTest extends TestCase$this->settings->enableScopedLocationsWithFullMultipleCompanySupport();$this->settings->disableFloaterMode();- $company = Company::factory()->create();+ $company = Company::factory()->create();$location = Location::factory()->create(['company_id' => null]);$this->actingAs(User::factory()->superuser()->create())@@ -99,7 +99,7 @@ class FmcsLocationValidationTest extends TestCase{$this->settings->enableScopedLocationsWithFullMultipleCompanySupport();- $company = Company::factory()->create();+ $company = Company::factory()->create();$location = Location::factory()->create(['company_id' => $company->id]);$this->actingAs(User::factory()->superuser()->create())@@ -114,14 +114,14 @@ class FmcsLocationValidationTest extends TestCase{$this->settings->enableScopedLocationsWithFullMultipleCompanySupport();- $company = Company::factory()->create();+ $company = Company::factory()->create();$location = Location::factory()->create(['company_id' => $company->id]);- $user = User::factory()->create();+ $user = User::factory()->create();$this->actingAs(User::factory()->superuser()->create())->put(route('users.update', $user), [- 'first_name' => $user->first_name,- 'username' => $user->username,+ 'first_name' => $user->first_name,+ 'username' => $user->username,'company_ids' => [$company->id],'location_id' => $location->id,])@@ -135,12 +135,12 @@ class FmcsLocationValidationTest extends TestCase[$companyA, $companyB] = Company::factory()->count(2)->create();$location = Location::factory()->create(['company_id' => $companyB->id]);- $user = User::factory()->create();+ $user = User::factory()->create();$this->actingAs(User::factory()->superuser()->create())->put(route('users.update', $user), [- 'first_name' => $user->first_name,- 'username' => $user->username,+ 'first_name' => $user->first_name,+ 'username' => $user->username,'company_ids' => [$companyA->id],'location_id' => $location->id,])