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 3942efa8e3d095a1d1084594d4c0d9959e91fde9..4bfb3c87822a5085fbb0f8c7a862c6177b5821c6 100644 (file)
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -3,8 +3,8 @@
 namespace Tests\User;
 
 use Activity;
 namespace Tests\User;
 
 use Activity;

-use BookStack\Actions\ActivityType;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;
+use BookStack\Users\Models\User;

 use Tests\TestCase;
 
 class UserProfileTest extends TestCase
 use Tests\TestCase;
 
 class UserProfileTest extends TestCase


@@ -14,7 +14,7 @@ class UserProfileTest extends TestCase
      */
     protected $user;
 
      */
     protected $user;
 

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

     {
         parent::setUp();
         $this->user = User::all()->last();
     {
         parent::setUp();
         $this->user = User::all()->last();


@@ -29,7 +29,7 @@ class UserProfileTest extends TestCase
 
     public function test_profile_page_shows_recent_entities()
     {
 
     public function test_profile_page_shows_recent_entities()
     {

-        $content = $this->createEntityChainBelongingToUser($this->user, $this->user);
+        $content = $this->entities->createChainBelongingToUser($this->user, $this->user);

 
         $resp = $this->asAdmin()->get('/user/' . $this->user->slug);
         // Check the recently created page is shown
 
         $resp = $this->asAdmin()->get('/user/' . $this->user->slug);
         // Check the recently created page is shown


@@ -42,54 +42,54 @@ class UserProfileTest extends TestCase
 
     public function test_profile_page_shows_created_content_counts()
     {
 
     public function test_profile_page_shows_created_content_counts()
     {

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

 
 

-        $this->asAdmin()->get('/user/' . $newUser->slug)
-            ->assertSee($newUser->name)
-            ->assertElementContains('#content-counts', '0 Books')
+        $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');
 
             ->assertElementContains('#content-counts', '0 Chapters')
             ->assertElementContains('#content-counts', '0 Pages');
 

-        $this->createEntityChainBelongingToUser($newUser, $newUser);
+        $this->entities->createChainBelongingToUser($newUser, $newUser);

 
 

-        $this->asAdmin()->get('/user/' . $newUser->slug)
-            ->assertSee($newUser->name)
-            ->assertElementContains('#content-counts', '1 Book')
+        $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()
     {
             ->assertElementContains('#content-counts', '1 Chapter')
             ->assertElementContains('#content-counts', '1 Page');
     }
 
     public function test_profile_page_shows_recent_activity()
     {

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

         $this->actingAs($newUser);
         $this->actingAs($newUser);

-        $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
-        Activity::addForEntity($entities['book'], ActivityType::BOOK_UPDATE);
-        Activity::addForEntity($entities['page'], ActivityType::PAGE_CREATE);
+        $entities = $this->entities->createChainBelongingToUser($newUser, $newUser);
+        Activity::add(ActivityType::BOOK_UPDATE, $entities['book']);
+        Activity::add(ActivityType::PAGE_CREATE, $entities['page']);

 
 

-        $this->asAdmin()->get('/user/' . $newUser->slug)
-            ->assertElementContains('#recent-user-activity', 'updated book')
+        $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_user_activity_has_link_leading_to_profile()
     {
             ->assertElementContains('#recent-user-activity', 'created page')
             ->assertElementContains('#recent-user-activity', $entities['page']->name);
     }
 
     public function test_user_activity_has_link_leading_to_profile()
     {

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

         $this->actingAs($newUser);
         $this->actingAs($newUser);

-        $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
-        Activity::addForEntity($entities['book'], ActivityType::BOOK_UPDATE);
-        Activity::addForEntity($entities['page'], ActivityType::PAGE_CREATE);
+        $entities = $this->entities->createChainBelongingToUser($newUser, $newUser);
+        Activity::add(ActivityType::BOOK_UPDATE, $entities['book']);
+        Activity::add(ActivityType::PAGE_CREATE, $entities['page']);

 
         $linkSelector = '#recent-activity a[href$="/user/' . $newUser->slug . '"]';
 
         $linkSelector = '#recent-activity a[href$="/user/' . $newUser->slug . '"]';

-        $this->asAdmin()->get('/')
-            ->assertElementContains($linkSelector, $newUser->name);
+        $resp = $this->asAdmin()->get('/');
+        $this->withHtml($resp)->assertElementContains($linkSelector, $newUser->name);

     }
 
     public function test_profile_has_search_links_in_created_entity_lists()
     {
     }
 
     public function test_profile_has_search_links_in_created_entity_lists()
     {

-        $user = $this->getEditor();
-        $resp = $this->actingAs($this->getAdmin())->get('/user/' . $user->slug);
+        $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',
 
         $expectedLinks = [
             '/search?term=%7Bcreated_by%3A' . $user->slug . '%7D+%7Btype%3Apage%7D',


@@ -99,7 +99,7 @@ class UserProfileTest extends TestCase
         ];
 
         foreach ($expectedLinks as $link) {
         ];
 
         foreach ($expectedLinks as $link) {

-            $resp->assertElementContains('[href$="' . $link . '"]', 'View All');
+            $this->withHtml($resp)->assertElementContains('[href$="' . $link . '"]', 'View All');

         }
     }
 }
         }
     }
 }