public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #3956 from nevvermind/use-phpunit-preconditions 

Use PHPUnit pre-conditions
pull/3991/head
Jordi Boggiano 2015-05-01 10:50:17 +01:00
parent 6199488644 7834dacb88
commit d93406a668
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/Composer/Test/Util/FilesystemTest.php
View File

@ -179,6 +179,7 @@ class FilesystemTest extends TestCase
/** /**
* @link https://github.com/composer/composer/issues/3157 * @link https://github.com/composer/composer/issues/3157
* @requires function symlink
*/ */
public function testUnlinkSymlinkedDirectory() public function testUnlinkSymlinkedDirectory()
{ {
@ -188,7 +189,6 @@ class FilesystemTest extends TestCase
@mkdir($basepath . "/real", 0777, true); @mkdir($basepath . "/real", 0777, true);
touch($basepath . "/real/FILE"); touch($basepath . "/real/FILE");
$this->skipTestIfSymlinkPhpFunctionIsMissing();
$result = @symlink($basepath . "/real", $symlinked); $result = @symlink($basepath . "/real", $symlinked);
if (!$result) { if (!$result) {
@ -207,6 +207,7 @@ class FilesystemTest extends TestCase
/** /**
* @link https://github.com/composer/composer/issues/3144 * @link https://github.com/composer/composer/issues/3144
* @requires function symlink
*/ */
public function testRemoveSymlinkedDirectoryWithTrailingSlash() public function testRemoveSymlinkedDirectoryWithTrailingSlash()
{ {
@ -217,7 +218,6 @@ class FilesystemTest extends TestCase
$symlinked = $basepath . "/linked"; $symlinked = $basepath . "/linked";
$symlinkedTrailingSlash = $symlinked . "/"; $symlinkedTrailingSlash = $symlinked . "/";
$this->skipTestIfSymlinkPhpFunctionIsMissing();
$result = @symlink($basepath . "/real", $symlinked); $result = @symlink($basepath . "/real", $symlinked);
if (!$result) { if (!$result) {
@ -239,11 +239,4 @@ class FilesystemTest extends TestCase
$this->assertFalse(file_exists($symlinkedTrailingSlash)); $this->assertFalse(file_exists($symlinkedTrailingSlash));
$this->assertFalse(file_exists($symlinked)); $this->assertFalse(file_exists($symlinked));
} }
private function skipTestIfSymlinkPhpFunctionIsMissing()
{
if (!function_exists('symlink')) {
$this->markTestSkipped('The php symlink() function for symbolic links is not available on this platform');
}
}
} }