move zip export into exportservice

[bookstack] / tests / Uploads / AttachmentTest.php

diff --git a/tests/Uploads/AttachmentTest.php b/tests/Uploads/AttachmentTest.php
index 35ffda821ef35262f1b135fcde4c8cbc90c7a519..e98a90b35d2034aaa701a726a42fcb5de4939b30 100644 (file)
--- a/tests/Uploads/AttachmentTest.php
+++ b/tests/Uploads/AttachmentTest.php
@@ -1,8 +1,9 @@
-<?php namespace Tests;
+<?php namespace Tests\Uploads;

 
 use BookStack\Uploads\Attachment;
 use BookStack\Entities\Page;
 use BookStack\Auth\Permissions\PermissionService;
 
 use BookStack\Uploads\Attachment;
 use BookStack\Entities\Page;
 use BookStack\Auth\Permissions\PermissionService;

+use Tests\TestCase;

 
 class AttachmentTest extends TestCase
 {
 
 class AttachmentTest extends TestCase
 {


@@ -78,7 +79,7 @@ class AttachmentTest extends TestCase
         $upload->assertStatus(200);
 
         $attachment = Attachment::query()->orderBy('id', 'desc')->first();
         $upload->assertStatus(200);
 
         $attachment = Attachment::query()->orderBy('id', 'desc')->first();

-        $this->assertNotContains($fileName, $attachment->path);
+        $this->assertStringNotContainsString($fileName, $attachment->path);

         $this->assertStringEndsWith('.txt', $attachment->path);
     }
 
         $this->assertStringEndsWith('.txt', $attachment->path);
     }
 


@@ -223,7 +224,7 @@ class AttachmentTest extends TestCase
     {
         $admin = $this->getAdmin();
         $viewer = $this->getViewer();
     {
         $admin = $this->getAdmin();
         $viewer = $this->getViewer();

-        $page = Page::first();
+        $page = Page::first(); /** @var Page $page */

 
         $this->actingAs($admin);
         $fileName = 'permission_test.txt';
 
         $this->actingAs($admin);
         $fileName = 'permission_test.txt';


@@ -233,7 +234,7 @@ class AttachmentTest extends TestCase
         $page->restricted = true;
         $page->permissions()->delete();
         $page->save();
         $page->restricted = true;
         $page->permissions()->delete();
         $page->save();

-        $this->app[PermissionService::class]->buildJointPermissionsForEntity($page);
+        $page->rebuildPermissions();

         $page->load('jointPermissions');
 
         $this->actingAs($viewer);
         $page->load('jointPermissions');
 
         $this->actingAs($viewer);