1
0
Fork 0

Replaced changes in RemoteFilesystemTest with changes from main branch.

pull/2184/merge^2
matt-whittom 2013-08-13 10:04:47 -05:00 committed by mwhittom
parent 7fdcdb4c54
commit 997b1b5d46
1 changed files with 27 additions and 22 deletions

View File

@ -21,9 +21,9 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
{ {
$io = $this->getMock('Composer\IO\IOInterface'); $io = $this->getMock('Composer\IO\IOInterface');
$io $io
->expects($this->once()) ->expects($this->once())
->method('hasAuthentication') ->method('hasAuthentication')
->will($this->returnValue(false)) ->will($this->returnValue(false))
; ;
$res = $this->callGetOptionsForUrl($io, array('http://example.org', array())); $res = $this->callGetOptionsForUrl($io, array('http://example.org', array()));
@ -42,14 +42,14 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
{ {
$io = $this->getMock('Composer\IO\IOInterface'); $io = $this->getMock('Composer\IO\IOInterface');
$io $io
->expects($this->once()) ->expects($this->once())
->method('hasAuthentication') ->method('hasAuthentication')
->will($this->returnValue(true)) ->will($this->returnValue(true))
; ;
$io $io
->expects($this->once()) ->expects($this->once())
->method('getAuthentication') ->method('getAuthentication')
->will($this->returnValue(array('username' => 'login', 'password' => 'password'))) ->will($this->returnValue(array('username' => 'login', 'password' => 'password')))
; ;
$options = $this->callGetOptionsForUrl($io, array('http://example.org', array())); $options = $this->callGetOptionsForUrl($io, array('http://example.org', array()));
@ -67,9 +67,9 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
{ {
$io = $this->getMock('Composer\IO\IOInterface'); $io = $this->getMock('Composer\IO\IOInterface');
$io $io
->expects($this->once()) ->expects($this->once())
->method('hasAuthentication') ->method('hasAuthentication')
->will($this->returnValue(true)) ->will($this->returnValue(true))
; ;
$streamOptions = array('ssl' => array( $streamOptions = array('ssl' => array(
@ -84,9 +84,9 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
{ {
$io = $this->getMock('Composer\IO\IOInterface'); $io = $this->getMock('Composer\IO\IOInterface');
$io $io
->expects($this->once()) ->expects($this->once())
->method('hasAuthentication') ->method('hasAuthentication')
->will($this->returnValue(true)) ->will($this->returnValue(true))
; ;
$streamOptions = array('http' => array( $streamOptions = array('http' => array(
@ -118,8 +118,8 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
{ {
$io = $this->getMock('Composer\IO\IOInterface'); $io = $this->getMock('Composer\IO\IOInterface');
$io $io
->expects($this->once()) ->expects($this->once())
->method('overwrite') ->method('overwrite')
; ;
$fs = new RemoteFilesystem($io); $fs = new RemoteFilesystem($io);
@ -148,13 +148,18 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
public function testCaptureAuthenticationParamsFromUrl() public function testCaptureAuthenticationParamsFromUrl()
{ {
$io = $this->getMock('Composer\IO\IOInterface'); $io = $this->getMock('Composer\IO\IOInterface');
$io $io->expects($this->once())
->expects($this->once())
->method('setAuthentication') ->method('setAuthentication')
; ->with($this->equalTo('example.com'), $this->equalTo('user'), $this->equalTo('pass'));
$fs = new RemoteFilesystem($io); $fs = new RemoteFilesystem($io);
$fs->getContents('example.com', 'http://user:pass@www.example.com'); try {
$fs->getContents('example.com', 'http://user:pass@www.example.com/something');
} catch (\Exception $e) {
$this->assertInstanceOf('Composer\Downloader\TransportException', $e);
$this->assertEquals(404, $e->getCode());
$this->assertContains('404 Not Found', $e->getMessage());
}
} }
public function testGetContents() public function testGetContents()
@ -197,4 +202,4 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
$attr->setAccessible(true); $attr->setAccessible(true);
$attr->setValue($object, $value); $attr->setValue($object, $value);
} }
} }