From d77bd493011665dbbd85dc8ab544462ff67118ad Mon Sep 17 00:00:00 2001 From: mwhittom Date: Wed, 4 Sep 2013 09:30:23 -0500 Subject: [PATCH] Replaced RemoteFileSystemTest with version from main branch --- .../Test/Util/RemoteFilesystemTest.php | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/Composer/Test/Util/RemoteFilesystemTest.php b/tests/Composer/Test/Util/RemoteFilesystemTest.php index 39a3bb63d..eb8ebc07e 100644 --- a/tests/Composer/Test/Util/RemoteFilesystemTest.php +++ b/tests/Composer/Test/Util/RemoteFilesystemTest.php @@ -21,9 +21,9 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase { $io = $this->getMock('Composer\IO\IOInterface'); $io - ->expects($this->once()) - ->method('hasAuthentication') - ->will($this->returnValue(false)) + ->expects($this->once()) + ->method('hasAuthentication') + ->will($this->returnValue(false)) ; $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 - ->expects($this->once()) - ->method('hasAuthentication') - ->will($this->returnValue(true)) + ->expects($this->once()) + ->method('hasAuthentication') + ->will($this->returnValue(true)) ; $io - ->expects($this->once()) - ->method('getAuthentication') - ->will($this->returnValue(array('username' => 'login', 'password' => 'password'))) + ->expects($this->once()) + ->method('getAuthentication') + ->will($this->returnValue(array('username' => 'login', 'password' => 'password'))) ; $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 - ->expects($this->once()) - ->method('hasAuthentication') - ->will($this->returnValue(true)) + ->expects($this->once()) + ->method('hasAuthentication') + ->will($this->returnValue(true)) ; $streamOptions = array('ssl' => array( @@ -84,9 +84,9 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase { $io = $this->getMock('Composer\IO\IOInterface'); $io - ->expects($this->once()) - ->method('hasAuthentication') - ->will($this->returnValue(true)) + ->expects($this->once()) + ->method('hasAuthentication') + ->will($this->returnValue(true)) ; $streamOptions = array('http' => array( @@ -118,8 +118,8 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase { $io = $this->getMock('Composer\IO\IOInterface'); $io - ->expects($this->once()) - ->method('overwrite') + ->expects($this->once()) + ->method('overwrite') ; $fs = new RemoteFilesystem($io); @@ -149,8 +149,8 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase { $io = $this->getMock('Composer\IO\IOInterface'); $io->expects($this->once()) - ->method('setAuthentication') - ->with($this->equalTo('example.com'), $this->equalTo('user'), $this->equalTo('pass')); + ->method('setAuthentication') + ->with($this->equalTo('example.com'), $this->equalTo('user'), $this->equalTo('pass')); $fs = new RemoteFilesystem($io); try { @@ -202,4 +202,4 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase $attr->setAccessible(true); $attr->setValue($object, $value); } -} \ No newline at end of file +}