Merge branch 'master' into master

[bookstack] / tests / User / UserProfileTest.php

diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index cc39c0d8efbd58fb6f6b711ba78c316f390cdde2..27d97381e54393a8f469fcce6f47038cd3690dae 100644 (file)
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -3,7 +3,7 @@
 use Activity;
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\User;
 use Activity;
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\User;

-use BookStack\Entities\Bookshelf;
+use BookStack\Entities\Models\Bookshelf;

 use Tests\BrowserKitTest;
 
 class UserProfileTest extends BrowserKitTest
 use Tests\BrowserKitTest;
 
 class UserProfileTest extends BrowserKitTest


@@ -61,8 +61,8 @@ class UserProfileTest extends BrowserKitTest
         $newUser = $this->getNewBlankUser();
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         $newUser = $this->getNewBlankUser();
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);

-        Activity::add($entities['book'], ActivityType::BOOK_UPDATE, $entities['book']->id);
-        Activity::add($entities['page'], ActivityType::PAGE_CREATE, $entities['book']->id);
+        Activity::addForEntity($entities['book'], ActivityType::BOOK_UPDATE);
+        Activity::addForEntity($entities['page'], ActivityType::PAGE_CREATE);

 
         $this->asAdmin()->visit('/user/' . $newUser->id)
             ->seeInElement('#recent-user-activity', 'updated book')
 
         $this->asAdmin()->visit('/user/' . $newUser->id)
             ->seeInElement('#recent-user-activity', 'updated book')


@@ -75,8 +75,8 @@ class UserProfileTest extends BrowserKitTest
         $newUser = $this->getNewBlankUser();
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         $newUser = $this->getNewBlankUser();
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);

-        Activity::add($entities['book'], ActivityType::BOOK_UPDATE, $entities['book']->id);
-        Activity::add($entities['page'], ActivityType::PAGE_CREATE, $entities['book']->id);
+        Activity::addForEntity($entities['book'], ActivityType::BOOK_UPDATE);
+        Activity::addForEntity($entities['page'], ActivityType::PAGE_CREATE);

 
         $this->asAdmin()->visit('/')->clickInElement('#recent-activity', $newUser->name)
             ->seePageIs('/user/' . $newUser->id)
 
         $this->asAdmin()->visit('/')->clickInElement('#recent-activity', $newUser->name)
             ->seePageIs('/user/' . $newUser->id)