Skip to content

Commit cb780fd

Browse files
committed
fixing test paths for Windows
1 parent 7f959fc commit cb780fd

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/Symfony/Component/AssetPipeline/Tests/AssetPipelineRepositoryTest.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ public function testAll()
6363
'dir2' => '',
6464
], __DIR__.'/fixtures');
6565

66-
// C:\projects\symfony\src\Symfony\Component\Asset\Tests\Pipeline/fixtures/dir1/file1.css
67-
// C:\projects\symfony\src\Symfony\Component\Asset\Tests\Pipeline/fixtures/dir1\file1.css
68-
6966
$actualAllAssets = $repository->all();
7067
$this->assertCount(8, $actualAllAssets);
7168

@@ -76,8 +73,8 @@ public function testAll()
7673
'already-abcdefVWXYZ0123456789.digested.css' => __DIR__.'/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css',
7774
'file3.css' => __DIR__.'/fixtures/dir2/file3.css',
7875
'file4.js' => __DIR__.'/fixtures/dir2/file4.js',
79-
'subdir/file5.js' => __DIR__.'/fixtures/dir2/subdir/file5.js',
80-
'subdir/file6.js' => __DIR__.'/fixtures/dir2/subdir/file6.js',
76+
'subdir'.DIRECTORY_SEPARATOR.'file5.js' => __DIR__.'/fixtures/dir2/subdir/file5.js',
77+
'subdir'.DIRECTORY_SEPARATOR.'file6.js' => __DIR__.'/fixtures/dir2/subdir/file6.js',
8178
'test.gif.foo' => __DIR__.'/fixtures/dir2/test.gif.foo',
8279
]);
8380
$this->assertEquals($expectedAllAssets, array_map('realpath', $actualAllAssets));
@@ -90,7 +87,7 @@ public function testAllWithNamespaces()
9087
'dir2' => 'dir2_namespace',
9188
], __DIR__.'/fixtures');
9289

93-
$this->assertEquals([
90+
$expectedAllAssets = [
9491
'dir1_namespace/file1.css' => __DIR__.'/fixtures/dir1/file1.css',
9592
'dir1_namespace/file2.js' => __DIR__.'/fixtures/dir1/file2.js',
9693
'dir2_namespace/already-abcdefVWXYZ0123456789.digested.css' => __DIR__.'/fixtures/dir2/already-abcdefVWXYZ0123456789.digested.css',
@@ -99,6 +96,11 @@ public function testAllWithNamespaces()
9996
'dir2_namespace/subdir/file5.js' => __DIR__.'/fixtures/dir2/subdir/file5.js',
10097
'dir2_namespace/subdir/file6.js' => __DIR__.'/fixtures/dir2/subdir/file6.js',
10198
'dir2_namespace/test.gif.foo' => __DIR__.'/fixtures/dir2/test.gif.foo',
102-
], $repository->all());
99+
];
100+
foreach ($expectedAllAssets as $key => $val) {
101+
$expectedAllAssets[str_replace('/', DIRECTORY_SEPARATOR, $key)] = realpath($val);
102+
}
103+
104+
$this->assertEquals($expectedAllAssets, array_map('realpath', $repository->all()));
103105
}
104106
}

0 commit comments

Comments
 (0)