bugfix for bugfix/test-order/do-not-write-in-fixture-dir

contao · Mar 12, 2021 · c466d7e · c466d7e
1 parent 71e7cfa
commit c466d7e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core-bundle/tests/Command/SymlinksCommandTest.php b/core-bundle/tests/Command/SymlinksCommandTest.php
@@ -28,7 +28,7 @@ public static function setUpBeforeClass(): void
 
         $filesystem = new Filesystem();
 
-        foreach (['assets', 'files', 'system', 'vendor'] as $directory) {
+        foreach (['assets', 'files', 'system', 'var', 'vendor'] as $directory) {
             $filesystem->mirror(
                 Path::join(__DIR__.'/../Fixtures', $directory),
                 Path::join(self::getTempDir(), $directory)
@@ -56,14 +56,14 @@ public function testSymlinksTheContaoFolders(): void
         $code = $tester->execute([]);
         $display = $tester->getDisplay();
 
-        $this->assertSame(1, $code);
+        $this->assertSame(0, $code);
 
         $this->assertNotRegExp('# web/files +files #', $display);
         $this->assertRegExp('# web/files/public +files/public #', $display);
         $this->assertRegExp('# web/system/modules/foobar/html/foo/bar +Skipped because system/modules/foobar/html will be symlinked\. #', $display);
         $this->assertRegExp('# web/system/modules/foobar/assets +system/modules/foobar/assets #', $display);
         $this->assertRegExp('# web/system/modules/foobar/html +system/modules/foobar/html #', $display);
-        $this->assertRegExp('# system/themes/default +The path "system/themes/default" exists and is not a symlink\. #', $display);
+        $this->assertRegExp('# vendor/contao/test-bundle/Resources/contao/themes/default #', $display);
         $this->assertRegExp('# system/themes/flexible +vendor/contao/test-bundle/Resources/contao/themes/flexible #', $display);
         $this->assertRegExp('# web/assets +assets #', $display);
         $this->assertRegExp('# web/system/themes +system/themes #', $display);

diff --git a/...Fixtures/system/themes/default/.gitignore → ...dle/tests/Fixtures/system/themes/.gitkeep b/...Fixtures/system/themes/default/.gitignore → ...dle/tests/Fixtures/system/themes/.gitkeep
diff --git a/core-bundle/tests/Fixtures/var/logs/.gitkeep b/core-bundle/tests/Fixtures/var/logs/.gitkeep