fix(wysiwyg): preserves line feeds in code block mode

[bookstack] / tests / User / UserProfileTest.php

diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index 3942efa8e3d095a1d1084594d4c0d9959e91fde9..8693689759dac65884d355db94977aae67c52524 100644 (file)
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -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();


@@ -42,7 +42,7 @@ 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)
 
         $this->asAdmin()->get('/user/' . $newUser->slug)
             ->assertSee($newUser->name)


@@ -61,11 +61,11 @@ class UserProfileTest extends TestCase
 
     public function test_profile_page_shows_recent_activity()
     {
 
     public function test_profile_page_shows_recent_activity()
     {

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

         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);

-        Activity::addForEntity($entities['book'], ActivityType::BOOK_UPDATE);
-        Activity::addForEntity($entities['page'], ActivityType::PAGE_CREATE);
+        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')
 
         $this->asAdmin()->get('/user/' . $newUser->slug)
             ->assertElementContains('#recent-user-activity', 'updated book')


@@ -75,11 +75,11 @@ class UserProfileTest extends TestCase
 
     public function test_user_activity_has_link_leading_to_profile()
     {
 
     public function test_user_activity_has_link_leading_to_profile()
     {

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

         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);
         $this->actingAs($newUser);
         $entities = $this->createEntityChainBelongingToUser($newUser, $newUser);

-        Activity::addForEntity($entities['book'], ActivityType::BOOK_UPDATE);
-        Activity::addForEntity($entities['page'], ActivityType::PAGE_CREATE);
+        Activity::add(ActivityType::BOOK_UPDATE, $entities['book']);
+        Activity::add(ActivityType::PAGE_CREATE, $entities['page']);

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