From 997b1b5d46aa69f64b9c9ff2a92ab8bf84d03890 Mon Sep 17 00:00:00 2001
From: matt-whittom <Matt.Whittom@veteransunited.com>
Date: Tue, 13 Aug 2013 10:04:47 -0500
Subject: [PATCH] Replaced changes in RemoteFilesystemTest with changes from
 main branch.

---
 .../Test/Util/RemoteFilesystemTest.php        | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/tests/Composer/Test/Util/RemoteFilesystemTest.php b/tests/Composer/Test/Util/RemoteFilesystemTest.php
index f2950a2da..39a3bb63d 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);
@@ -148,13 +148,18 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
     public function testCaptureAuthenticationParamsFromUrl()
     {
         $io = $this->getMock('Composer\IO\IOInterface');
-        $io
-        ->expects($this->once())
+        $io->expects($this->once())
         ->method('setAuthentication')
-        ;
+        ->with($this->equalTo('example.com'), $this->equalTo('user'), $this->equalTo('pass'));
 
         $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()
@@ -197,4 +202,4 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
         $attr->setAccessible(true);
         $attr->setValue($object, $value);
     }
-}
+}
\ No newline at end of file