travis: fixed tests - xdebug headers for PHP 5.6

meenie · Mar 14, 2015 · 4688393 · 4688393
1 parent 4e376da
commit 4688393
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tests/Munee/Cases/ResponseTest.php b/tests/Munee/Cases/ResponseTest.php
@@ -55,7 +55,7 @@ public function testNonCachedResponse()
 
         $this->assertSame($checkHeaders['Cache-Control'], $setHeaders['Cache-Control']);
         unset($setHeaders['Cache-Control']);
-        $this->assertSame($checkHeaders['Content-Type'], $setHeaders['Content-Type']);
+        $this->assertContains($checkHeaders['Content-Type'], $setHeaders['Content-Type']);
         unset($setHeaders['Content-Type']);
         $this->assertSame($checkHeaders['Last-Modified'], $setHeaders['Last-Modified']);
         unset($setHeaders['Last-Modified']);
@@ -127,7 +127,7 @@ public function testExpiredRequestResponse()
 
         $this->assertSame($checkHeaders['Cache-Control'], $setHeaders['Cache-Control']);
         unset($setHeaders['Cache-Control']);
-        $this->assertSame($checkHeaders['Content-Type'], $setHeaders['Content-Type']);
+        $this->assertContains($checkHeaders['Content-Type'], $setHeaders['Content-Type']);
         unset($setHeaders['Content-Type']);
         $this->assertSame($checkHeaders['Last-Modified'], $setHeaders['Last-Modified']);
         unset($setHeaders['Last-Modified']);
@@ -166,6 +166,10 @@ protected function getHeaders()
         foreach ($rawHeaders as $header) {
             $headerParts = explode(':', $header, 2);
             if (2 == count($headerParts)) {
+                if ($headerParts[0] === 'Content-type') {
+                    // xdebug incompatible naming
+                    $headerParts[0] = 'Content-Type';
+                }
                 $ret[$headerParts[0]] = trim($headerParts[1]);
             } elseif (isset($ret[$headerParts[0]])) {
                 // If a header param is empty, make sure others with the same name are not set as well