X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/f139cded789908efce3ac2ed1be26b947df647db..refs/pull/3698/head:/tests/User/UserProfileTest.php diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php index c3888f8c5..e6136962a 100644 --- a/tests/User/UserProfileTest.php +++ b/tests/User/UserProfileTest.php @@ -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->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'); } @@ -64,11 +64,11 @@ 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); + 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); } @@ -78,12 +78,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); + 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'); } } }