Added language list favourites sorting, updated styles

[bookstack] / tests / User / UserProfileTest.php

diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index 3942efa8e3d095a1d1084594d4c0d9959e91fde9..e6136962ad9c51fb45891b35130a5d8912f95221 100644 (file)
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -14,7 +14,7 @@ class UserProfileTest extends TestCase
      */
     protected $user;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
         $this->user = User::all()->last();
@@ -42,48 +42,48 @@ class UserProfileTest extends TestCase
 
     public function test_profile_page_shows_created_content_counts()
     {
-        $newUser = factory(User::class)->create();
+        $newUser = User::factory()->create();
 
-        $this->asAdmin()->get('/user/' . $newUser->slug)
-            ->assertSee($newUser->name)
-            ->assertElementContains('#content-counts', '0 Books')
+        $resp = $this->asAdmin()->get('/user/' . $newUser->slug)
+            ->assertSee($newUser->name);
+        $this->withHtml($resp)->assertElementContains('#content-counts', '0 Books')
             ->assertElementContains('#content-counts', '0 Chapters')
             ->assertElementContains('#content-counts', '0 Pages');
 
         $this->createEntityChainBelongingToUser($newUser, $newUser);
 
-        $this->asAdmin()->get('/user/' . $newUser->slug)
-            ->assertSee($newUser->name)
-            ->assertElementContains('#content-counts', '1 Book')
+        $resp = $this->asAdmin()->get('/user/' . $newUser->slug)
+            ->assertSee($newUser->name);
+        $this->withHtml($resp)->assertElementContains('#content-counts', '1 Book')
             ->assertElementContains('#content-counts', '1 Chapter')
             ->assertElementContains('#content-counts', '1 Page');
     }
 
     public function test_profile_page_shows_recent_activity()
     {
-        $newUser = factory(User::class)->create();
+        $newUser = User::factory()->create();
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
-        Activity::addForEntity($entities['book'], ActivityType::BOOK_UPDATE);
-        Activity::addForEntity($entities['page'], ActivityType::PAGE_CREATE);
+        Activity::add(ActivityType::BOOK_UPDATE, $entities['book']);
+        Activity::add(ActivityType::PAGE_CREATE, $entities['page']);
 
-        $this->asAdmin()->get('/user/' . $newUser->slug)
-            ->assertElementContains('#recent-user-activity', 'updated book')
+        $resp = $this->asAdmin()->get('/user/' . $newUser->slug);
+        $this->withHtml($resp)->assertElementContains('#recent-user-activity', 'updated book')
             ->assertElementContains('#recent-user-activity', 'created page')
             ->assertElementContains('#recent-user-activity', $entities['page']->name);
     }
 
     public function test_user_activity_has_link_leading_to_profile()
     {
-        $newUser = factory(User::class)->create();
+        $newUser = User::factory()->create();
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
-        Activity::addForEntity($entities['book'], ActivityType::BOOK_UPDATE);
-        Activity::addForEntity($entities['page'], ActivityType::PAGE_CREATE);
+        Activity::add(ActivityType::BOOK_UPDATE, $entities['book']);
+        Activity::add(ActivityType::PAGE_CREATE, $entities['page']);
 
         $linkSelector = '#recent-activity a[href$="/user/' . $newUser->slug . '"]';
-        $this->asAdmin()->get('/')
-            ->assertElementContains($linkSelector, $newUser->name);
+        $resp = $this->asAdmin()->get('/');
+        $this->withHtml($resp)->assertElementContains($linkSelector, $newUser->name);
     }
 
     public function test_profile_has_search_links_in_created_entity_lists()
@@ -99,7 +99,7 @@ class UserProfileTest extends TestCase
         ];
 
         foreach ($expectedLinks as $link) {
-            $resp->assertElementContains('[href$="' . $link . '"]', 'View All');
+            $this->withHtml($resp)->assertElementContains('[href$="' . $link . '"]', 'View All');
         }
     }
 }