Extend /users API endpoint

[bookstack] / tests / User / UserProfileTest.php

diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index 0a3a1a6b202fcf776457f9478ddba01e39cbd76b..a5db83c48e78816ed4af15402f8c5185209272b5 100644 (file)
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -1,8 +1,9 @@
-<?php namespace Test\User;
+<?php namespace Tests\User;

 
 use Activity;
 
 use Activity;

+use BookStack\Actions\ActivityType;

 use BookStack\Auth\User;
 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


@@ -18,7 +19,7 @@ class UserProfileTest extends BrowserKitTest
     public function test_profile_page_shows_name()
     {
         $this->asAdmin()
     public function test_profile_page_shows_name()
     {
         $this->asAdmin()

-            ->visit('/user/' . $this->user->id)
+            ->visit('/user/' . $this->user->slug)

             ->see($this->user->name);
     }
 
             ->see($this->user->name);
     }
 


@@ -27,7 +28,7 @@ class UserProfileTest extends BrowserKitTest
         $content = $this->createEntityChainBelongingToUser($this->user, $this->user);
 
         $this->asAdmin()
         $content = $this->createEntityChainBelongingToUser($this->user, $this->user);
 
         $this->asAdmin()

-            ->visit('/user/' . $this->user->id)
+            ->visit('/user/' . $this->user->slug)

             // Check the recently created page is shown
             ->see($content['page']->name)
             // Check the recently created chapter is shown
             // Check the recently created page is shown
             ->see($content['page']->name)
             // Check the recently created chapter is shown


@@ -40,7 +41,7 @@ class UserProfileTest extends BrowserKitTest
     {
         $newUser = $this->getNewBlankUser();
 
     {
         $newUser = $this->getNewBlankUser();
 

-        $this->asAdmin()->visit('/user/' . $newUser->id)
+        $this->asAdmin()->visit('/user/' . $newUser->slug)

             ->see($newUser->name)
             ->seeInElement('#content-counts', '0 Books')
             ->seeInElement('#content-counts', '0 Chapters')
             ->see($newUser->name)
             ->seeInElement('#content-counts', '0 Books')
             ->seeInElement('#content-counts', '0 Chapters')


@@ -48,7 +49,7 @@ class UserProfileTest extends BrowserKitTest
 
         $this->createEntityChainBelongingToUser($newUser, $newUser);
 
 
         $this->createEntityChainBelongingToUser($newUser, $newUser);
 

-        $this->asAdmin()->visit('/user/' . $newUser->id)
+        $this->asAdmin()->visit('/user/' . $newUser->slug)

             ->see($newUser->name)
             ->seeInElement('#content-counts', '1 Book')
             ->seeInElement('#content-counts', '1 Chapter')
             ->see($newUser->name)
             ->seeInElement('#content-counts', '1 Book')
             ->seeInElement('#content-counts', '1 Chapter')


@@ -60,10 +61,10 @@ 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'], 'book_update', $entities['book']->id);
-        Activity::add($entities['page'], '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)
+        $this->asAdmin()->visit('/user/' . $newUser->slug)

             ->seeInElement('#recent-user-activity', 'updated book')
             ->seeInElement('#recent-user-activity', 'created page')
             ->seeInElement('#recent-user-activity', $entities['page']->name);
             ->seeInElement('#recent-user-activity', 'updated book')
             ->seeInElement('#recent-user-activity', 'created page')
             ->seeInElement('#recent-user-activity', $entities['page']->name);


@@ -74,11 +75,11 @@ 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'], 'book_update', $entities['book']->id);
-        Activity::add($entities['page'], '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)
 
         $this->asAdmin()->visit('/')->clickInElement('#recent-activity', $newUser->name)

-            ->seePageIs('/user/' . $newUser->id)
+            ->seePageIs('/user/' . $newUser->slug)

             ->see($newUser->name);
     }
 
             ->see($newUser->name);
     }