Fixed canonical redirects on non-root url app instances

[bookstack] / tests / Entity / EntityTest.php

diff --git a/tests/Entity/EntityTest.php b/tests/Entity/EntityTest.php
index 3d12ed7495943dcc75ef979d87d845a57c41ee47..de1e025ade6a1e832cad59834f0c0774abf8ad1e 100644 (file)
--- a/tests/Entity/EntityTest.php
+++ b/tests/Entity/EntityTest.php
@@ -1,4 +1,4 @@
-<?php namespace Tests;
+<?php namespace Tests\Entity;

 
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Book;
 
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Book;


@@ -7,6 +7,8 @@ use BookStack\Entities\Page;
 use BookStack\Auth\UserRepo;
 use BookStack\Entities\Repos\PageRepo;
 use Carbon\Carbon;
 use BookStack\Auth\UserRepo;
 use BookStack\Entities\Repos\PageRepo;
 use Carbon\Carbon;

+use Illuminate\Support\Facades\DB;
+use Tests\BrowserKitTest;

 
 class EntityTest extends BrowserKitTest
 {
 
 class EntityTest extends BrowserKitTest
 {


@@ -271,15 +273,20 @@ class EntityTest extends BrowserKitTest
             ->seeInElement('#recently-updated-pages', $page->name);
     }
 
             ->seeInElement('#recently-updated-pages', $page->name);
     }
 

-    public function test_slug_multi_byte_lower_casing()
+    public function test_slug_multi_byte_url_safe()

     {
         $book = $this->newBook([
     {
         $book = $this->newBook([

-            'name' => 'Ð\9aÐ\9dÐ\98Ð\93Ð\90'
+            'name' => 'инÑ\84оÑ\80маÑ\86иÑ\8f'

         ]);
 
         ]);
 

-        $this->assertEquals('книга', $book->slug);
-    }
+        $this->assertEquals('informatsiya', $book->slug);
+
+        $book = $this->newBook([
+            'name' => '¿Qué?'
+        ]);

 
 

+        $this->assertEquals('que', $book->slug);
+    }

 
     public function test_slug_format()
     {
 
     public function test_slug_format()
     {


@@ -315,4 +322,44 @@ class EntityTest extends BrowserKitTest
             ->seePageIs($book->getUrl());
     }
 
             ->seePageIs($book->getUrl());
     }
 

+    public function test_page_within_chapter_deletion_returns_to_chapter()
+    {
+        $chapter = Chapter::query()->first();
+        $page = $chapter->pages()->first();
+
+        $this->asEditor()->visit($page->getUrl('/delete'))
+            ->submitForm('Confirm')
+            ->seePageIs($chapter->getUrl());
+    }
+
+    public function test_page_delete_removes_entity_from_its_activity()
+    {
+        $page = Page::query()->first();
+
+        $this->asEditor()->put($page->getUrl(), [
+            'name' => 'My updated page',
+            'html' => '<p>updated content</p>',
+        ]);
+        $page->refresh();
+
+        $this->seeInDatabase('activities', [
+            'entity_id' => $page->id,
+            'entity_type' => $page->getMorphClass(),
+        ]);
+
+        $resp = $this->delete($page->getUrl());
+        $resp->assertResponseStatus(302);
+
+        $this->dontSeeInDatabase('activities', [
+            'entity_id' => $page->id,
+            'entity_type' => $page->getMorphClass(),
+        ]);
+
+        $this->seeInDatabase('activities', [
+            'extra' => 'My updated page',
+            'entity_id' => 0,
+            'entity_type' => '',
+        ]);
+    }
+

 }
 }