From a2f8d1540b53d4e707ef3ca9e2aec09b6aaf9a41 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Wed, 27 Sep 2023 14:42:42 +0000
Subject: [PATCH] fix tests

---
 Controller/FileUploaderTrait.php | 8 +++++---
 tests/Autoloader.php             | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Controller/FileUploaderTrait.php b/Controller/FileUploaderTrait.php
index 85836b4..c168752 100644
--- a/Controller/FileUploaderTrait.php
+++ b/Controller/FileUploaderTrait.php
@@ -40,9 +40,11 @@ trait FileUploaderTrait
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public static function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
+    public function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
-        $head = $response->data['Content']->head;
-        $head->addAsset(AssetType::JS, '/Modules/Media/Controller.js', ['type' => 'module']);
+        $head  = $response->data['Content']->head;
+        $nonce = $this->app->appSettings->getOption('script-nonce');
+
+        $head->addAsset(AssetType::JS, '/Modules/Media/Controller.js', ['nonce' => $nonce, 'type' => 'module']);
     }
 }
diff --git a/tests/Autoloader.php b/tests/Autoloader.php
index d9355f2..5e33b31 100755
--- a/tests/Autoloader.php
+++ b/tests/Autoloader.php
@@ -83,9 +83,12 @@ final class Autoloader
         }
 
         $class2 = $class;
+        $class3 = $class;
 
         $pos = \stripos($class, '/');
         if ($pos !== false) {
+            $class3 = \substr($class, $pos + 1);
+
             $pos = \stripos($class, '/', $pos + 1);
 
             if ($pos !== false) {
@@ -94,7 +97,7 @@ final class Autoloader
         }
 
         foreach (self::$paths as $path) {
-            if (\is_file($file = $path . $class2 . '.php')) {
+            if (\is_file($file = $path . $class2 . '.php') && \stripos($file, $class3) !== false) {
                 include_once $file;
 
                 return;