From: William Desportes Date: Wed, 8 Feb 2023 13:18:03 +0100 Subject: Adjust path for source files in tests Origin: upstream Forwarded: https://github.com/phpmyadmin/phpmyadmin/commit/84aee1b13b7db73d85d8f42390bcdcc3f6abcd95.patch --- test/classes/Command/TwigLintCommandTest.php | 8 ++++---- test/classes/ThemeTest.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/classes/Command/TwigLintCommandTest.php b/test/classes/Command/TwigLintCommandTest.php index f56f9a0..c87cac0 100644 --- a/test/classes/Command/TwigLintCommandTest.php +++ b/test/classes/Command/TwigLintCommandTest.php @@ -44,7 +44,7 @@ class TwigLintCommandTest extends AbstractTestCase public function testGetTemplateContents(): void { $contents = $this->callFunction($this->command, TwigLintCommand::class, 'getTemplateContents', [ - ROOT_PATH . 'test/classes/_data/file_listing/subfolder/one.ini', + TEST_PATH . 'test/classes/_data/file_listing/subfolder/one.ini', ]); $this->assertSame('key=value' . "\n", $contents); @@ -52,7 +52,7 @@ class TwigLintCommandTest extends AbstractTestCase public function testFindFiles(): void { - $path = ROOT_PATH . 'test/classes/_data/file_listing'; + $path = TEST_PATH . 'test/classes/_data/file_listing'; $filesFound = $this->callFunction($this->command, TwigLintCommand::class, 'findFiles', [$path]); // Sort results to avoid file system test specific failures @@ -68,7 +68,7 @@ class TwigLintCommandTest extends AbstractTestCase public function testGetFilesInfo(): void { - $path = ROOT_PATH . 'test/classes/_data/file_listing'; + $path = TEST_PATH . 'test/classes/_data/file_listing'; $filesInfos = $this->callFunction($this->command, TwigLintCommand::class, 'getFilesInfo', [$path]); // Sort results to avoid file system test specific failures @@ -122,7 +122,7 @@ class TwigLintCommandTest extends AbstractTestCase ->willReturnOnConsecutiveCalls('{{ file }}', '{{ file }'); $filesFound = $this->callFunction($command, TwigLintCommand::class, 'getFilesInfo', [ - ROOT_PATH . 'test/classes/_data/file_listing', + TEST_PATH . 'test/classes/_data/file_listing', ]); $this->assertEquals([ diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index e21e363..a088b61 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -69,7 +69,7 @@ class ThemeTest extends AbstractTestCase */ public function testCheckImgPathIncorrect(): void { - $this->object->setPath(ROOT_PATH . 'test/classes/_data/incorrect_theme'); + $this->object->setPath(TEST_PATH . 'test/classes/_data/incorrect_theme'); $this->assertFalse( $this->object->loadInfo(), 'Theme name is not properly set'