Opensearch: Fixed XML declaration when php short tags enabled

[bookstack] / tests / User / UserProfileTest.php

diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index c3888f8c511768fcd2a89956218c23ba5fb2d5df..065ae8dc896c3c10a5af47fbb005f843425a0dcd 100644 (file)
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\User;
 
-use Activity;
-use BookStack\Actions\ActivityType;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Facades\Activity;
+use BookStack\Users\Models\User;
 use Tests\TestCase;
 
 class UserProfileTest extends TestCase
@@ -29,7 +29,7 @@ class UserProfileTest extends TestCase
 
     public function test_profile_page_shows_recent_entities()
     {
-        $content = $this->createEntityChainBelongingToUser($this->user, $this->user);
+        $content = $this->entities->createChainBelongingToUser($this->user, $this->user);
 
         $resp = $this->asAdmin()->get('/user/' . $this->user->slug);
         // Check the recently created page is shown
@@ -44,17 +44,17 @@ class UserProfileTest extends TestCase
     {
         $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->entities->createChainBelongingToUser($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');
     }
@@ -63,12 +63,12 @@ class UserProfileTest extends TestCase
     {
         $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);
+        $entities = $this->entities->createChainBelongingToUser($newUser, $newUser);
+        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);
     }
@@ -77,19 +77,19 @@ class UserProfileTest extends TestCase
     {
         $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);
+        $entities = $this->entities->createChainBelongingToUser($newUser, $newUser);
+        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()
     {
-        $user = $this->getEditor();
-        $resp = $this->actingAs($this->getAdmin())->get('/user/' . $user->slug);
+        $user = $this->users->editor();
+        $resp = $this->actingAs($this->users->admin())->get('/user/' . $user->slug);
 
         $expectedLinks = [
             '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Apage%7D',
@@ -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');
         }
     }
 }