From acacd092534743be7a726e98ba400583606c3025 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 14 Mar 2019 00:13:32 +0800 Subject: [PATCH] Fix cleaning up --- tests/MarketControllerTest.php | 4 ++-- tests/PluginControllerTest.php | 2 +- tests/ServicesTest/HookTest.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/MarketControllerTest.php b/tests/MarketControllerTest.php index ee8c153c..28444915 100644 --- a/tests/MarketControllerTest.php +++ b/tests/MarketControllerTest.php @@ -81,7 +81,7 @@ class MarketControllerTest extends TestCase ]); $this->assertTrue(is_dir(config('plugins.directory').DIRECTORY_SEPARATOR.'fake-test-download')); $this->assertTrue( - empty(glob(config('plugins.directory').DIRECTORY_SEPARATOR.'plugins/fake-test-download_*.zip')) + empty(glob(config('plugins.directory').DIRECTORY_SEPARATOR.'fake-test-download_*.zip')) ); // Broken archive @@ -170,7 +170,7 @@ class MarketControllerTest extends TestCase ], ]); - File::deleteDirectory(base_path('plugins/'.$package['name'])); + File::deleteDirectory(config('plugins.directory').DIRECTORY_SEPARATOR.$package['name']); } protected function tearDown(): void diff --git a/tests/PluginControllerTest.php b/tests/PluginControllerTest.php index a5e3b0b9..755f217d 100644 --- a/tests/PluginControllerTest.php +++ b/tests/PluginControllerTest.php @@ -143,7 +143,7 @@ class PluginControllerTest extends TestCase { // Clean fake plugins File::deleteDirectory(config('plugins.directory').DIRECTORY_SEPARATOR.'fake-plugin-for-test'); - File::deleteDirectory(config('plugins.directory').DIRECTORY_SEPARATOR.'plugins/fake-plugin-with-config-view'); + File::deleteDirectory(config('plugins.directory').DIRECTORY_SEPARATOR.'fake-plugin-with-config-view'); parent::tearDown(); } diff --git a/tests/ServicesTest/HookTest.php b/tests/ServicesTest/HookTest.php index 666542a2..3f5426f7 100644 --- a/tests/ServicesTest/HookTest.php +++ b/tests/ServicesTest/HookTest.php @@ -45,7 +45,7 @@ class HookTest extends TestCase $this->get('/') ->assertSee('fake-plugin-with-i18n/lang/en/locale.js'); - File::deleteDirectory(config('plugins.directory').DIRECTORY_SEPARATOR.'plugins/fake-plugin-with-i18n'); + File::deleteDirectory(config('plugins.directory').DIRECTORY_SEPARATOR.'fake-plugin-with-i18n'); } public function testAddStyleFileToPage()