Merge branch 'master' into bug/image-upload

[bookstack] / tests / UserProfileTest.php

diff --git a/tests/UserProfileTest.php b/tests/UserProfileTest.php
index 12f88483f6a6e6e2171fec1034c514ecfb8eda60..c1e254090f27ac1d336001fd7e5630a6813bcc27 100644 (file)
--- a/tests/UserProfileTest.php
+++ b/tests/UserProfileTest.php
@@ -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,7 +52,7 @@ 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);
@@ -66,7 +66,7 @@ class UserProfileTest extends BrowserKitTest
 
     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);
@@ -94,5 +94,26 @@ class UserProfileTest extends BrowserKitTest
             ->seePageIs('/settings/users/' . $guestUser->id)
             ->see('cannot delete the guest user');
     }
-    
+
+    public function test_books_view_is_list()
+    {
+        $editor = $this->getEditor();
+        setting()->putUser($editor, 'books_view_type', 'list');
+
+        $this->actingAs($editor)
+            ->visit('/books')
+            ->pageNotHasElement('.featured-image-container')
+            ->pageHasElement('.content .entity-list-item');
+    }
+
+    public function test_books_view_is_grid()
+    {
+        $editor = $this->getEditor();
+        setting()->putUser($editor, 'books_view_type', 'grid');
+
+        $this->actingAs($editor)
+            ->visit('/books')
+            ->pageHasElement('.featured-image-container');
+    }
+
 }