Comments: Fixed failing tests due to unset template variable

[bookstack] / tests / User / UserProfileTest.php

diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index fc1a529ae43076f59d38d2d642c534c0ff816cd7..4bfb3c87822a5085fbb0f8c7a862c6177b5821c6 100644 (file)
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -1,119 +1,105 @@
-<?php namespace Tests;
+<?php

 
 

-class UserProfileTest extends BrowserKitTest
+namespace Tests\User;
+
+use Activity;
+use BookStack\Activity\ActivityType;
+use BookStack\Users\Models\User;
+use Tests\TestCase;
+
+class UserProfileTest extends TestCase

 {
 {

+    /**
+     * @var User
+     */

     protected $user;
 
     protected $user;
 

-    public function setUp(): void
+    protected function setUp(): void

     {
         parent::setUp();
     {
         parent::setUp();

-        $this->user = \BookStack\Auth\User::all()->last();
+        $this->user = User::all()->last();

     }
 
     public function test_profile_page_shows_name()
     {
         $this->asAdmin()
     }
 
     public function test_profile_page_shows_name()
     {
         $this->asAdmin()

-            ->visit('/user/' . $this->user->id)
-            ->see($this->user->name);
+            ->get('/user/' . $this->user->slug)
+            ->assertSee($this->user->name);

     }
 
     public function test_profile_page_shows_recent_entities()
     {
     }
 
     public function test_profile_page_shows_recent_entities()
     {

-        $content = $this->createEntityChainBelongingToUser($this->user, $this->user);
-
-        $this->asAdmin()
-            ->visit('/user/' . $this->user->id)
-            // Check the recently created page is shown
-            ->see($content['page']->name)
-            // Check the recently created chapter is shown
-            ->see($content['chapter']->name)
-            // Check the recently created book is shown
-            ->see($content['book']->name);
+        $content = $this->entities->createChainBelongingToUser($this->user, $this->user);
+
+        $resp = $this->asAdmin()->get('/user/' . $this->user->slug);
+        // Check the recently created page is shown
+        $resp->assertSee($content['page']->name);
+        // Check the recently created chapter is shown
+        $resp->assertSee($content['chapter']->name);
+        // Check the recently created book is shown
+        $resp->assertSee($content['book']->name);

     }
 
     public function test_profile_page_shows_created_content_counts()
     {
     }
 
     public function test_profile_page_shows_created_content_counts()
     {

-        $newUser = $this->getNewBlankUser();
+        $newUser = User::factory()->create();

 
 

-        $this->asAdmin()->visit('/user/' . $newUser->id)
-            ->see($newUser->name)
-            ->seeInElement('#content-counts', '0 Books')
-            ->seeInElement('#content-counts', '0 Chapters')
-            ->seeInElement('#content-counts', '0 Pages');
+        $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->entities->createChainBelongingToUser($newUser, $newUser);

 
 

-        $this->asAdmin()->visit('/user/' . $newUser->id)
-            ->see($newUser->name)
-            ->seeInElement('#content-counts', '1 Book')
-            ->seeInElement('#content-counts', '1 Chapter')
-            ->seeInElement('#content-counts', '1 Page');
+        $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');

     }
 
     public function test_profile_page_shows_recent_activity()
     {
     }
 
     public function test_profile_page_shows_recent_activity()
     {

-        $newUser = $this->getNewBlankUser();
+        $newUser = User::factory()->create();

         $this->actingAs($newUser);
         $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-user-activity', 'updated book')
-            ->seeInElement('#recent-user-activity', 'created page')
-            ->seeInElement('#recent-user-activity', $entities['page']->name);
+        $entities = $this->entities->createChainBelongingToUser($newUser, $newUser);
+        Activity::add(ActivityType::BOOK_UPDATE, $entities['book']);
+        Activity::add(ActivityType::PAGE_CREATE, $entities['page']);
+
+        $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);

     }
 
     }
 

-    public function test_clicking_user_name_in_activity_leads_to_profile_page()
+    public function test_user_activity_has_link_leading_to_profile()

     {
     {

-        $newUser = $this->getNewBlankUser();
+        $newUser = User::factory()->create();

         $this->actingAs($newUser);
         $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);
+        $entities = $this->entities->createChainBelongingToUser($newUser, $newUser);
+        Activity::add(ActivityType::BOOK_UPDATE, $entities['book']);
+        Activity::add(ActivityType::PAGE_CREATE, $entities['page']);

 
 

-        $this->asAdmin()->visit('/')->clickInElement('#recent-activity', $newUser->name)
-            ->seePageIs('/user/' . $newUser->id)
-            ->see($newUser->name);
+        $linkSelector = '#recent-activity a[href$="/user/' . $newUser->slug . '"]';
+        $resp = $this->asAdmin()->get('/');
+        $this->withHtml($resp)->assertElementContains($linkSelector, $newUser->name);

     }
 
     }
 

-    public function test_guest_profile_shows_limited_form()
+    public function test_profile_has_search_links_in_created_entity_lists()

     {
     {

-        $this->asAdmin()
-            ->visit('/settings/users')
-            ->click('Guest')
-            ->dontSeeElement('#password');
+        $user = $this->users->editor();
+        $resp = $this->actingAs($this->users->admin())->get('/user/' . $user->slug);
+
+        $expectedLinks = [
+            '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Apage%7D',
+            '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Achapter%7D',
+            '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Abook%7D',
+            '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Abookshelf%7D',
+        ];
+
+        foreach ($expectedLinks as $link) {
+            $this->withHtml($resp)->assertElementContains('[href$="' . $link . '"]', 'View All');
+        }

     }
     }

-
-    public function test_guest_profile_cannot_be_deleted()
-    {
-        $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_view_is_list()
-    {
-        $editor = $this->getEditor();
-        setting()->putUser($editor, 'books_view_type', 'list');
-
-        $this->actingAs($editor)
-            ->visit('/books')
-            ->pageNotHasElement('.featured-image-container')
-            ->pageHasElement('.content-wrap .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');
-    }
-

 }
 }