From 56bcafb0950fdb51b2a9ff0b57a8dadf78697986 Mon Sep 17 00:00:00 2001
From: Michael Dowling <mtdowling@gmail.com>
Date: Wed, 31 Aug 2011 13:06:02 -0500
Subject: [PATCH] Fixing more unit tests

---
 .../Tests/Http/Message/EntityEnclosingRequestTest.php     | 8 ++++++--
 tests/Guzzle/Tests/Http/Message/RequestTest.php           | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/Guzzle/Tests/Http/Message/EntityEnclosingRequestTest.php b/tests/Guzzle/Tests/Http/Message/EntityEnclosingRequestTest.php
index 4e09b0ef..cd19183c 100644
--- a/tests/Guzzle/Tests/Http/Message/EntityEnclosingRequestTest.php
+++ b/tests/Guzzle/Tests/Http/Message/EntityEnclosingRequestTest.php
@@ -137,8 +137,12 @@ class EntityEnclosingRequestTest extends \Guzzle\Tests\GuzzleTestCase
         $this->getServer()->enqueue("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
         $request = RequestFactory::create('POST', $this->getServer()->getUrl());
         $request->addPostFiles(array(__FILE__));
+        $request->addPostFields(array(
+            'test' => 'abc'
+        ));
         $this->assertEquals(array(
-            'file' => '@' . __FILE__
+            'file' => '@' . __FILE__,
+            'test' => 'abc'
         ), $request->getPostFields()->getAll());
         $this->assertEquals(array(
             'file' => __FILE__
@@ -146,7 +150,7 @@ class EntityEnclosingRequestTest extends \Guzzle\Tests\GuzzleTestCase
         $request->send();
         
         $this->assertNotNull($request->getHeader('Content-Length'));
-        $this->assertContains('multipart/form-data; boundary=--', $request->getHeader('Content-Type'), '-> cURL must add the boundary');
+        $this->assertContains('multipart/form-data; boundary=', $request->getHeader('Content-Type'), '-> cURL must add the boundary');
     }
 
     /**
diff --git a/tests/Guzzle/Tests/Http/Message/RequestTest.php b/tests/Guzzle/Tests/Http/Message/RequestTest.php
index 418e1d7a..c12724b3 100644
--- a/tests/Guzzle/Tests/Http/Message/RequestTest.php
+++ b/tests/Guzzle/Tests/Http/Message/RequestTest.php
@@ -83,7 +83,7 @@ class RequestTest extends \Guzzle\Tests\GuzzleTestCase
         // Add authorization after the fact and see that it was put in the message
         $this->getServer()->enqueue("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
         $request = RequestFactory::put($this->getServer()->getUrl(), null, 'Data');
-        $request->setAuth('michael', '123', 'Basic');
+        $request->setAuth('michael', '123', CURLAUTH_BASIC);
         $request->send();
         $str = (string) $request;
         $this->assertTrue((bool) strpos($str, 'Authorization: Basic ' . $auth));