♻️ fixed test for reload api option

Signed-off-by: bnomei <[email protected]>
bnomei · Sep 3, 2024 · 29d738d · 29d738d
1 parent 92c1654
commit 29d738d
Show file tree

Hide file tree

Showing 8 changed files with 173 additions and 168 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby3-janitor",
     "type": "kirby-plugin",
-    "version": "4.4.0",
+    "version": "4.4.1",
     "license": "MIT",
     "homepage": "https://github.com/bnomei/kirby3-janitor",
     "description": "Kirby Plugin for running commands like cleaning the cache from within the Panel, PHP code or a cronjob",

diff --git a/composer.lock b/composer.lock
diff --git a/index.js b/index.js
diff --git a/src/components/fields/Janitor.vue b/src/components/fields/Janitor.vue
@@ -165,7 +165,7 @@ export default {
 				return;
 			}
 
-			this.postRequest("plugin-janitor", { command: this.command });
+			await this.postRequest("plugin-janitor", { command: this.command });
 		},
 
 		async postRequest(path, data) {

diff --git a/tests/site/commands/reload.php b/tests/site/commands/reload.php
@@ -1,4 +1,3 @@
-
 <?php
 
 use Bnomei\Janitor;
@@ -10,8 +9,6 @@
     'command' => static function (CLI $cli): void {
         $cli->error('No reload in CLI.');
 
-        ray('reload', $cli->args());
-
         janitor()->data($cli->arg('command'), [
             'status' => 200,
             'reload' => true, // will trigger JS location.reload in panel

diff --git a/tests/site/config/config.php b/tests/site/config/config.php
@@ -10,6 +10,13 @@
         ],
     ],
 
+    // DO NOT USE BASIC AUTH IN PRODUCTION
+    // I only use this in my dev env to test the janitor commands
+    'api' => [
+        'basicAuth' => true,
+        'allowInsecure' => true,
+    ],
+
     'bnomei.janitor.secret' => 'e9fe51f94eadabf54',
 
     // janitor v2 job callback

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby3-janitor',
-        'pretty_version' => '4.4.0',
-        'version' => '4.4.0.0',
+        'pretty_version' => '4.4.1',
+        'version' => '4.4.1.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby3-janitor' => array(
-            'pretty_version' => '4.4.0',
-            'version' => '4.4.0.0',
+            'pretty_version' => '4.4.1',
+            'version' => '4.4.1.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',
@@ -38,9 +38,9 @@
             'dev_requirement' => false,
         ),
         'symfony/finder' => array(
-            'pretty_version' => 'v7.1.3',
-            'version' => '7.1.3.0',
-            'reference' => '717c6329886f32dc65e27461f80f2a465412fdca',
+            'pretty_version' => 'v7.1.4',
+            'version' => '7.1.4.0',
+            'reference' => 'd95bbf319f7d052082fb7af147e0f835a695e823',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/finder',
             'aliases' => array(),

diff --git a/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php b/vendor/symfony/finder/Iterator/RecursiveDirectoryIterator.php
@@ -63,8 +63,9 @@ public function current(): SplFileInfo
             $subPathname .= $this->directorySeparator;
         }
         $subPathname .= $this->getFilename();
+        $basePath = $this->rootPath;
 
-        if ('/' !== $basePath = $this->rootPath) {
+        if ('/' !== $basePath && !str_ends_with($basePath, $this->directorySeparator) && !str_ends_with($basePath, '/')) {
             $basePath .= $this->directorySeparator;
         }