Skip to content

[AssetMapper] Fix failing tests (+ dependencies) #52192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2023
Merged

[AssetMapper] Fix failing tests (+ dependencies) #52192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapConfigReaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ class ImportMapConfigReaderTest extends TestCase
protected function setUp(): void
{
$this->filesystem = new Filesystem();
if (!file_exists(__DIR__ . '/../Fixtures/importmaps_for_writing')) {
$this->filesystem->mkdir(__DIR__ . '/../Fixtures/importmaps_for_writing');
if (!file_exists(__DIR__.'/../Fixtures/importmaps_for_writing')) {
$this->filesystem->mkdir(__DIR__.'/../Fixtures/importmaps_for_writing');
}
if (!file_exists(__DIR__ . '/../Fixtures/importmaps_for_writing/assets')) {
$this->filesystem->mkdir(__DIR__ . '/../Fixtures/importmaps_for_writing/assets');
if (!file_exists(__DIR__.'/../Fixtures/importmaps_for_writing/assets')) {
$this->filesystem->mkdir(__DIR__.'/../Fixtures/importmaps_for_writing/assets');
}
}

protected function tearDown(): void
{
$this->filesystem->remove(__DIR__ . '/../Fixtures/importmaps_for_writing');
$this->filesystem->remove(__DIR__.'/../Fixtures/importmaps_for_writing');
}

public function testGetEntriesAndWriteEntries()
Expand All @@ -63,7 +63,7 @@ public function testGetEntriesAndWriteEntries()
],
];
EOF;
file_put_contents(__DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php', $importMap);
file_put_contents(__DIR__.'/../Fixtures/importmaps_for_writing/importmap.php', $importMap);

$remotePackageStorage = $this->createMock(RemotePackageStorage::class);
$remotePackageStorage->expects($this->any())
Expand All @@ -72,7 +72,7 @@ public function testGetEntriesAndWriteEntries()
return '/path/to/vendor/'.$packageModuleSpecifier.'.'.$type->value;
});
$reader = new ImportMapConfigReader(
__DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php',
__DIR__.'/../Fixtures/importmaps_for_writing/importmap.php',
$remotePackageStorage,
);
$entries = $reader->getEntries();
Expand Down Expand Up @@ -100,24 +100,24 @@ public function testGetEntriesAndWriteEntries()
$this->assertSame('package/with_file.js', $packageWithFileEntry->packageModuleSpecifier);

// now save the original raw data from importmap.php and delete the file
$originalImportMapData = (static fn () => include __DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php')();
unlink(__DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php');
$originalImportMapData = (static fn () => include __DIR__.'/../Fixtures/importmaps_for_writing/importmap.php')();
unlink(__DIR__.'/../Fixtures/importmaps_for_writing/importmap.php');
// dump the entries back to the file
$reader->writeEntries($entries);
$newImportMapData = (static fn () => include __DIR__ . '/../Fixtures/importmaps_for_writing/importmap.php')();
$newImportMapData = (static fn () => include __DIR__.'/../Fixtures/importmaps_for_writing/importmap.php')();

$this->assertSame($originalImportMapData, $newImportMapData);
}

public function testGetRootDirectory()
{
$configReader = new ImportMapConfigReader(__DIR__ . '/../Fixtures/importmap.php', $this->createMock(RemotePackageStorage::class));
$this->assertSame(__DIR__ . '/../Fixtures', $configReader->getRootDirectory());
$configReader = new ImportMapConfigReader(__DIR__.'/../Fixtures/importmap.php', $this->createMock(RemotePackageStorage::class));
$this->assertSame(__DIR__.'/../Fixtures', $configReader->getRootDirectory());
}

public function testFindRootImportMapEntry()
{
$configReader = new ImportMapConfigReader(__DIR__.'/../fixtures/importmap.php', $this->createMock(RemotePackageStorage::class));
$configReader = new ImportMapConfigReader(__DIR__.'/../Fixtures/importmap.php', $this->createMock(RemotePackageStorage::class));
$entry = $configReader->findRootImportMapEntry('file2');
$this->assertSame('file2', $entry->importName);
$this->assertSame('file2.js', $entry->path);
Expand Down
7 changes: 2 additions & 5 deletions src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,12 @@ class ImportMapGeneratorTest extends TestCase
private ImportMapGenerator $importMapGenerator;

private Filesystem $filesystem;
private static string $writableRoot = __DIR__.'/../fixtures/importmaps_for_writing';
private static string $writableRoot = __DIR__.'/../Fixtures/importmaps_for_writing';

protected function setUp(): void
{
$this->filesystem = new Filesystem();
if (!file_exists(__DIR__.'/../fixtures/importmaps_for_writing')) {
$this->filesystem->mkdir(self::$writableRoot);
}
if (!file_exists(__DIR__.'/../fixtures/importmaps_for_writing/assets')) {
if (!file_exists(self::$writableRoot.'/assets')) {
$this->filesystem->mkdir(self::$writableRoot.'/assets');
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ class ImportMapManagerTest extends TestCase
private ImportMapManager $importMapManager;

private Filesystem $filesystem;
private static string $writableRoot = __DIR__ . '/../Fixtures/importmaps_for_writing';
private static string $writableRoot = __DIR__.'/../Fixtures/importmaps_for_writing';

protected function setUp(): void
{
$this->filesystem = new Filesystem();
if (!file_exists(__DIR__ . '/../Fixtures/importmaps_for_writing')) {
if (!file_exists(__DIR__.'/../Fixtures/importmaps_for_writing')) {
$this->filesystem->mkdir(self::$writableRoot);
}
if (!file_exists(__DIR__ . '/../Fixtures/importmaps_for_writing/assets')) {
if (!file_exists(__DIR__.'/../Fixtures/importmaps_for_writing/assets')) {
$this->filesystem->mkdir(self::$writableRoot.'/assets');
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/AssetMapper/Tests/ImportMap/RemotePackageDownloaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class RemotePackageDownloaderTest extends TestCase
{
private Filesystem $filesystem;
private static string $writableRoot = __DIR__ . '/../Fixtures/importmaps_for_writing';
private static string $writableRoot = __DIR__.'/../Fixtures/importmaps_for_writing';

protected function setUp(): void
{
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/AssetMapper/Tests/ImportMap/RemotePackageStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
class RemotePackageStorageTest extends TestCase
{
private Filesystem $filesystem;
private static string $writableRoot = __DIR__ . '/../Fixtures/importmaps_for_writing';
private static string $writableRoot = __DIR__.'/../Fixtures/importmaps_for_writing';

protected function setUp(): void
{
Expand Down