Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Models/Asset.php

@@ -1031,9 +1031,9 @@ public function getEula()
     {
 
         if (($this->model) && ($this->model->category)) {
-            if (($this->model->category->eula_text) && ($this->model->category->use_default_eula === 0)) {
+            if (($this->model->category->eula_text) && ($this->model->category->use_default_eula == 0)) {
                 return Helper::parseEscapedMarkedown($this->model->category->eula_text);
-            } elseif ($this->model->category->use_default_eula === 1) {
+            } elseif ($this->model->category->use_default_eula == 1) {
                 return Helper::parseEscapedMarkedown(Setting::getSettings()->default_eula_text);
             } else {
 

tests/Feature/Users/Api/StoreUsersTest.php renamed to tests/Feature/Users/Api/CreateUserTest.php

@@ -5,10 +5,12 @@
 use App\Models\Company;
 use App\Models\Department;
 use App\Models\User;
+use App\Notifications\WelcomeNotification;
+use Illuminate\Support\Facades\Notification;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Tests\TestCase;
 
-class StoreUsersTest extends TestCase
+class CreateUserTest extends TestCase
 {
     public function testRequiresPermission()
     {
@@ -58,21 +60,61 @@ public function testDepartmentIdNeedsToBeInteger()
             });
     }
 
-    public function testCanStoreUser()
+    public function testCanCreateUser()
     {
         $this->actingAsForApi(User::factory()->createUsers()->create())
             ->postJson(route('api.users.store'), [
-                'first_name' => 'Darth',
-                'username' => 'darthvader',
-                'password' => 'darth_password',
-                'password_confirmation' => 'darth_password',
+                'first_name' => 'Test First Name',
+                'last_name' => 'Test Last Name',
+                'username' => 'testuser',
+                'password' => 'testpassword1235!!',
+                'password_confirmation' => 'testpassword1235!!',
+                'send_welcome' => '1',
+                'activated' => '1',
+                'notes' => 'Test Note',
             ])
             ->assertStatusMessageIs('success')
             ->assertOk();
 
         $this->assertDatabaseHas('users', [
-            'first_name' => 'Darth',
-            'username' => 'darthvader',
+            'first_name' => 'Test First Name',
+            'last_name' => 'Test Last Name',
+            'username' => 'testuser',
+            'activated' => '1',
+            'notes' => 'Test Note',
+
+        ]);
+    }
+
+    public function testCanCreateAndNotifyUser()
+    {
+        Notification::fake();
+
+        $this->actingAsForApi(User::factory()->createUsers()->create())
+            ->postJson(route('api.users.store'), [
+                'first_name' => 'Test First Name',
+                'last_name' => 'Test Last Name',
+                'username' => 'testuser',
+                'password' => 'testpassword1235!!',
+                'password_confirmation' => 'testpassword1235!!',
+                'send_welcome' => '1',
+                'activated' => '1',
+                'email' => '[email protected]',
+                'notes' => 'Test Note',
+            ])
+            ->assertStatusMessageIs('success')
+            ->assertOk();
+
+        $this->assertDatabaseHas('users', [
+            'first_name' => 'Test First Name',
+            'last_name' => 'Test Last Name',
+            'username' => 'testuser',
+            'activated' => '1',
+            'email' => '[email protected]',
+            'notes' => 'Test Note',
         ]);
+
+        $user = User::where('username', 'testuser')->first();
+        Notification::assertSentTo($user, WelcomeNotification::class);
     }
 }

tests/Feature/Users/Ui/CreateUserTest.php

@@ -3,6 +3,8 @@
 namespace Tests\Feature\Users\Ui;
 
 use App\Models\User;
+use App\Notifications\WelcomeNotification;
+use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 
 class CreateUserTest extends TestCase
@@ -25,6 +27,39 @@ public function testPageRenders()
 
     public function testCanCreateUser()
     {
+        $response = $this->actingAs(User::factory()->createUsers()->viewUsers()->create())
+            ->from(route('users.index'))
+            ->post(route('users.store'), [
+                'first_name' => 'Test First Name',
+                'last_name' => 'Test Last Name',
+                'username' => 'testuser',
+                'password' => 'testpassword1235!!',
+                'password_confirmation' => 'testpassword1235!!',
+                'send_welcome' => '1',
+                'activated' => '1',
+                'notes' => 'Test Note',
+            ])
+            ->assertSessionHasNoErrors()
+            ->assertStatus(302)
+            ->assertRedirect(route('users.index'));
+
+        $this->assertDatabaseHas('users', [
+            'first_name' => 'Test First Name',
+            'last_name' => 'Test Last Name',
+            'username' => 'testuser',
+            'activated' => '1',
+            'notes' => 'Test Note',
+
+        ]);
+
+        $this->followRedirects($response)->assertSee('Success');
+
+    }
+
+    public function testCanCreateAndNotifyUser()
+    {
+
+        Notification::fake();
 
         $response = $this->actingAs(User::factory()->createUsers()->viewUsers()->create())
             ->from(route('users.index'))
@@ -33,11 +68,27 @@ public function testCanCreateUser()
                 'last_name' => 'Test Last Name',
                 'username' => 'testuser',
                 'password' => 'testpassword1235!!',
-                //'notes' => 'Test Note',
+                'password_confirmation' => 'testpassword1235!!',
+                'send_welcome' => '1',
+                'activated' => '1',
+                'email' => '[email protected]',
+                'notes' => 'Test Note',
             ])
+            ->assertSessionHasNoErrors()
             ->assertStatus(302)
             ->assertRedirect(route('users.index'));
 
+        $this->assertDatabaseHas('users', [
+            'first_name' => 'Test First Name',
+            'last_name' => 'Test Last Name',
+            'username' => 'testuser',
+            'activated' => '1',
+            'email' => '[email protected]',
+            'notes' => 'Test Note',
+        ]);
+
+        $user = User::where('username', 'testuser')->first();
+        Notification::assertSentTo($user, WelcomeNotification::class);
         $this->followRedirects($response)->assertSee('Success');
 
     }