From bb81e3721a20b7238acb228f506aa461cad7bb49 Mon Sep 17 00:00:00 2001 From: Samuel ROZE Date: Tue, 25 Aug 2015 09:19:10 +0100 Subject: [PATCH] Move the `proc_open` test in setUp --- .../Package/Version/VersionGuesserTest.php | 29 +++---------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/tests/Composer/Test/Package/Version/VersionGuesserTest.php b/tests/Composer/Test/Package/Version/VersionGuesserTest.php index d6437f5e7..2c5db1ff5 100644 --- a/tests/Composer/Test/Package/Version/VersionGuesserTest.php +++ b/tests/Composer/Test/Package/Version/VersionGuesserTest.php @@ -13,25 +13,22 @@ namespace Composer\Test\Package\Version; use Composer\Config; -use Composer\Package\Loader\RootPackageLoader; use Composer\Package\Version\VersionGuesser; use Composer\Package\Version\VersionParser; class VersionGuesserTest extends \PHPUnit_Framework_TestCase { - public function testDetachedHeadBecomesDevHash() + public function setUp() { if (!function_exists('proc_open')) { $this->markTestSkipped('proc_open() is not available'); } + } + public function testDetachedHeadBecomesDevHash() + { $commitHash = '03a15d220da53c52eddd5f32ffca64a7b3801bea'; - $manager = $this->getMockBuilder('\\Composer\\Repository\\RepositoryManager') - ->disableOriginalConstructor() - ->getMock() - ; - $executor = $this->getMockBuilder('\\Composer\\Util\\ProcessExecutor') ->setMethods(array('execute')) ->disableArgumentCloning() @@ -69,15 +66,6 @@ class VersionGuesserTest extends \PHPUnit_Framework_TestCase public function testTagBecomesVersion() { - if (!function_exists('proc_open')) { - $this->markTestSkipped('proc_open() is not available'); - } - - $manager = $this->getMockBuilder('\\Composer\\Repository\\RepositoryManager') - ->disableOriginalConstructor() - ->getMock() - ; - $executor = $this->getMockBuilder('\\Composer\\Util\\ProcessExecutor') ->setMethods(array('execute')) ->disableArgumentCloning() @@ -108,15 +96,6 @@ class VersionGuesserTest extends \PHPUnit_Framework_TestCase public function testInvalidTagBecomesVersion() { - if (!function_exists('proc_open')) { - $this->markTestSkipped('proc_open() is not available'); - } - - $manager = $this->getMockBuilder('\\Composer\\Repository\\RepositoryManager') - ->disableOriginalConstructor() - ->getMock() - ; - $executor = $this->getMockBuilder('\\Composer\\Util\\ProcessExecutor') ->setMethods(array('execute')) ->disableArgumentCloning()