Merge branch '4.x' of https://github.com/craftcms/cms into 5.x

craftcms · Oct 22, 2024 · 2d0cbe7 · 2d0cbe7
2 parents c430a0e + 38c6b21
commit 2d0cbe7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/test/TestSetup.php b/src/test/TestSetup.php
@@ -319,6 +319,7 @@ public static function configureCraft(): bool
 
         $configPath = realpath(CRAFT_CONFIG_PATH);
         $contentMigrationsPath = realpath(CRAFT_MIGRATIONS_PATH);
+        $rootPath = realpath(CRAFT_ROOT_PATH);
         $storagePath = realpath(CRAFT_STORAGE_PATH);
         $templatesPath = realpath(CRAFT_TEMPLATES_PATH);
         $testsPath = realpath(CRAFT_TESTS_PATH);
@@ -350,6 +351,7 @@ public static function configureCraft(): bool
         Craft::setAlias('@appicons', $srcPath . DIRECTORY_SEPARATOR . 'icons');
         Craft::setAlias('@config', $configPath);
         Craft::setAlias('@contentMigrations', $contentMigrationsPath);
+        Craft::setAlias('@root', $rootPath);
         Craft::setAlias('@storage', $storagePath);
         Craft::setAlias('@templates', $templatesPath);
         Craft::setAlias('@tests', $testsPath);

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
@@ -5,6 +5,8 @@
 ini_set('date.timezone', 'UTC');
 date_default_timezone_set('UTC');
 
+define('CRAFT_ROOT_PATH', dirname(__DIR__));
+
 // Use the current installation of Craft
 const CRAFT_TESTS_PATH = __DIR__;
 const CRAFT_STORAGE_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_craft' . DIRECTORY_SEPARATOR . 'storage';

diff --git a/tests/unit/web/twig/ExtensionTest.php b/tests/unit/web/twig/ExtensionTest.php
@@ -979,7 +979,6 @@ public function testCloneFunction(): void
      */
     public function testDataUrlFunction(): void
     {
-        Craft::setAlias('@root', dirname(__DIR__, 4));
         $path = '@root/.github/workflows/ci.yml';
         $dataUrl = $this->view->renderString('{{ dataUrl(path) }}', compact('path'));
         self::assertStringStartsWith('data:application/x-yaml;base64,', $dataUrl);