X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/1ed74b859866cda9c65b931481069bf2f3294673..refs/pull/1534/head:/tests/UserProfileTest.php

diff --git a/tests/UserProfileTest.php b/tests/UserProfileTest.php
index 25edfbf5e..a7c7505a8 100644
--- a/tests/UserProfileTest.php
+++ b/tests/UserProfileTest.php
@@ -7,7 +7,7 @@ class UserProfileTest extends BrowserKitTest
     public function setUp()
     {
         parent::setUp();
-        $this->user = \BookStack\User::all()->last();
+        $this->user = \BookStack\Auth\User::all()->last();
     }
 
     public function test_profile_page_shows_name()
@@ -33,7 +33,7 @@ class UserProfileTest extends BrowserKitTest
 
     public function test_profile_page_shows_created_content_counts()
     {
-        $newUser = $this->getEditor();
+        $newUser = $this->getNewBlankUser();
 
         $this->asAdmin()->visit('/user/' . $newUser->id)
             ->see($newUser->name)
@@ -52,21 +52,21 @@ class UserProfileTest extends BrowserKitTest
 
     public function test_profile_page_shows_recent_activity()
     {
-        $newUser = $this->getEditor();
+        $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);
 
         $this->asAdmin()->visit('/user/' . $newUser->id)
-            ->seeInElement('#recent-activity', 'updated book')
-            ->seeInElement('#recent-activity', 'created page')
-            ->seeInElement('#recent-activity', $entities['page']->name);
+            ->seeInElement('#recent-user-activity', 'updated book')
+            ->seeInElement('#recent-user-activity', 'created page')
+            ->seeInElement('#recent-user-activity', $entities['page']->name);
     }
 
     public function test_clicking_user_name_in_activity_leads_to_profile_page()
     {
-        $newUser = $this->getEditor();
+        $newUser = $this->getNewBlankUser();
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         \Activity::add($entities['book'], 'book_update', $entities['book']->id);
@@ -87,31 +87,33 @@ class UserProfileTest extends BrowserKitTest
 
     public function test_guest_profile_cannot_be_deleted()
     {
-        $guestUser = \BookStack\User::getDefault();
+        $guestUser = \BookStack\Auth\User::getDefault();
         $this->asAdmin()->visit('/settings/users/' . $guestUser->id . '/delete')
             ->see('Delete User')->see('Guest')
             ->press('Confirm')
             ->seePageIs('/settings/users/' . $guestUser->id)
             ->see('cannot delete the guest user');
     }
-    
-    public function test_books_display_is_list()
+
+    public function test_books_view_is_list()
     {
-        $this->asAdmin()
-            ->visit('/settings/users/' . $this->user->id)
-            ->select('#books_display', 'List')
-            ->press('Save')
+        $editor = $this->getEditor();
+        setting()->putUser($editor, 'books_view_type', 'list');
+
+        $this->actingAs($editor)
             ->visit('/books')
-            ->pageHasElement('.entity-list-item');
+            ->pageNotHasElement('.featured-image-container')
+            ->pageHasElement('.content-wrap .entity-list-item');
     }
 
-    public function test_books_display_is_grid()
+    public function test_books_view_is_grid()
     {
-        $this->asAdmin()
-            ->visit('/settings/users/' . $this->user->id)
-            ->select('#books_display', 'Grid')
-            ->press('Save')
+        $editor = $this->getEditor();
+        setting()->putUser($editor, 'books_view_type', 'grid');
+
+        $this->actingAs($editor)
             ->visit('/books')
-            ->pageHasElement('.gallery-item');
+            ->pageHasElement('.featured-image-container');
     }
+
 }