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

Fix tests

pull/2053/head
Jordi Boggiano 2013-06-28 20:42:06 +02:00
parent e68d455c5c
commit 0822683706
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Composer/Test/ConfigTest.php
View File

@ -112,9 +112,9 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
public function testOverrideGithubProtocols() public function testOverrideGithubProtocols()
{ {
$config = new Config(); $config = new Config();
$config->merge(array('config' => array('github-protocols' => array('https', 'http')))); $config->merge(array('config' => array('github-protocols' => array('https', 'git'))));
$config->merge(array('config' => array('github-protocols' => array('http')))); $config->merge(array('config' => array('github-protocols' => array('https'))));
$this->assertEquals(array('http'), $config->get('github-protocols')); $this->assertEquals(array('https'), $config->get('github-protocols'));
} }
} }

13
tests/Composer/Test/Downloader/GitDownloaderTest.php
View File

@ -107,28 +107,22 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
$expectedGitCommand = $this->winCompat("git clone 'https://github.com/composer/composer' 'composerPath' && cd 'composerPath' && git remote add composer 'https://github.com/composer/composer' && git fetch composer"); $expectedGitCommand = $this->winCompat("git clone 'https://github.com/composer/composer' 'composerPath' && cd 'composerPath' && git remote add composer 'https://github.com/composer/composer' && git fetch composer");
$processExecutor->expects($this->at(2)) $processExecutor->expects($this->at(2))
->method('execute')
->with($this->equalTo($expectedGitCommand))
->will($this->returnValue(1));
$expectedGitCommand = $this->winCompat("git clone 'http://github.com/composer/composer' 'composerPath' && cd 'composerPath' && git remote add composer 'http://github.com/composer/composer' && git fetch composer");
$processExecutor->expects($this->at(4))
->method('execute') ->method('execute')
->with($this->equalTo($expectedGitCommand)) ->with($this->equalTo($expectedGitCommand))
->will($this->returnValue(0)); ->will($this->returnValue(0));
$expectedGitCommand = $this->winCompat("git remote set-url --push origin 'git@github.com:composer/composer.git'"); $expectedGitCommand = $this->winCompat("git remote set-url --push origin 'git@github.com:composer/composer.git'");
$processExecutor->expects($this->at(5)) $processExecutor->expects($this->at(3))
->method('execute') ->method('execute')
->with($this->equalTo($expectedGitCommand), $this->equalTo(null), $this->equalTo($this->winCompat('composerPath'))) ->with($this->equalTo($expectedGitCommand), $this->equalTo(null), $this->equalTo($this->winCompat('composerPath')))
->will($this->returnValue(0)); ->will($this->returnValue(0));
$processExecutor->expects($this->at(6)) $processExecutor->expects($this->at(4))
->method('execute') ->method('execute')
->with($this->equalTo('git branch -r')) ->with($this->equalTo('git branch -r'))
->will($this->returnValue(0)); ->will($this->returnValue(0));
$processExecutor->expects($this->at(7)) $processExecutor->expects($this->at(5))
->method('execute') ->method('execute')
->with($this->equalTo($this->winCompat("git checkout 'ref' && git reset --hard 'ref'")), $this->equalTo(null), $this->equalTo($this->winCompat('composerPath'))) ->with($this->equalTo($this->winCompat("git checkout 'ref' && git reset --hard 'ref'")), $this->equalTo(null), $this->equalTo($this->winCompat('composerPath')))
->will($this->returnValue(0)); ->will($this->returnValue(0));
@ -142,7 +136,6 @@ class GitDownloaderTest extends \PHPUnit_Framework_TestCase
return array( return array(
array('git', 'git@github.com:composer/composer.git'), array('git', 'git@github.com:composer/composer.git'),
array('https', 'https://github.com/composer/composer.git'), array('https', 'https://github.com/composer/composer.git'),
array('http', 'https://github.com/composer/composer.git')
); );
} }