move zip export into exportservice

[bookstack] / tests / Permissions / RolesTest.php

diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php
index 371cffc0f3bd1be95a263c2bffd4c5f4277bb8f2..99080d354c4c239fae8261e8de53d06681b7e7fe 100644 (file)
--- a/tests/Permissions/RolesTest.php
+++ b/tests/Permissions/RolesTest.php
@@ -1,4 +1,4 @@
-<?php namespace Tests;
+<?php namespace Tests\Permissions;

 
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Page;
 
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Page;


@@ -6,6 +6,7 @@ use BookStack\Auth\Permissions\PermissionsRepo;
 use BookStack\Auth\Role;
 use Laravel\BrowserKitTesting\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use BookStack\Auth\Role;
 use Laravel\BrowserKitTesting\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

+use Tests\BrowserKitTest;

 
 class RolesTest extends BrowserKitTest
 {
 
 class RolesTest extends BrowserKitTest
 {


@@ -637,14 +638,14 @@ class RolesTest extends BrowserKitTest
             $ownPage->getUrl() => 'Delete'
         ]);
 
             $ownPage->getUrl() => 'Delete'
         ]);
 

-        $bookUrl = $ownPage->book->getUrl();
+        $parent = $ownPage->chapter ?? $ownPage->book;

         $this->visit($otherPage->getUrl())
             ->dontSeeInElement('.action-buttons', 'Delete')
             ->visit($otherPage->getUrl() . '/delete')
             ->seePageIs('/');
         $this->visit($ownPage->getUrl())->visit($ownPage->getUrl() . '/delete')
             ->press('Confirm')
         $this->visit($otherPage->getUrl())
             ->dontSeeInElement('.action-buttons', 'Delete')
             ->visit($otherPage->getUrl() . '/delete')
             ->seePageIs('/');
         $this->visit($ownPage->getUrl())->visit($ownPage->getUrl() . '/delete')
             ->press('Confirm')

-            ->seePageIs($bookUrl)
+            ->seePageIs($parent->getUrl())

             ->dontSeeInElement('.book-content', $ownPage->name);
     }
 
             ->dontSeeInElement('.book-content', $ownPage->name);
     }
 


@@ -658,10 +659,10 @@ class RolesTest extends BrowserKitTest
             $otherPage->getUrl() => 'Delete'
         ]);
 
             $otherPage->getUrl() => 'Delete'
         ]);
 

-        $bookUrl = $otherPage->book->getUrl();
+        $parent = $otherPage->chapter ?? $otherPage->book;

         $this->visit($otherPage->getUrl())->visit($otherPage->getUrl() . '/delete')
             ->press('Confirm')
         $this->visit($otherPage->getUrl())->visit($otherPage->getUrl() . '/delete')
             ->press('Confirm')

-            ->seePageIs($bookUrl)
+            ->seePageIs($parent->getUrl())

             ->dontSeeInElement('.book-content', $otherPage->name);
     }
 
             ->dontSeeInElement('.book-content', $otherPage->name);
     }