Fix tests for cake 2.6, see #46

imsamurai · Mar 17, 2015 · f3b64d5 · f3b64d5
1 parent 07f9531
commit f3b64d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,11 +11,12 @@ env:
     - PLUGIN_PATH=Plugin/HttpSource
     - REQUIRE="imsamurai/cakephp-environment:dev-master phpdocumentor/phpdocumentor:2.* symfony/process: 2.4.*"
     - DB=mysql
-    - CAKE_VERSION=2.4
+    - CAKE_VERSION=2.5
     - secure: gJVq4HkCVB3UZ/f9aBjCqT9IsOby4Ze9N67bp4BXOLcLDeWnpAOfbi85F0HATxXcuQA5A55UOFWqHFYXigVQ2J3w6Um3jseGCUi4ssh09u0orksDzem5OzulPVaJltiM5LC7d9GgSQDVaN5nDAIfP+bZE4SDIWUpwftO0xTuaSY=
   matrix:
     - CAKE_VERSION=2.4
     - CAKE_VERSION=2.5
+    - CAKE_VERSION=2.6
 
 matrix:
   include:

diff --git a/Test/Case/Model/Datasource/HttpSourceConnectionTest.php b/Test/Case/Model/Datasource/HttpSourceConnectionTest.php
@@ -52,7 +52,8 @@ public function testConstruct(array $config, $transportName, array $transportCon
 		$constructor = $reflectedClass->getConstructor();
 		$constructor->invoke($Connection, $config, $Transport);
 		$this->assertSame($transportName, get_class($Connection->getTransport()));
-		$this->assertSame($transportConfig, $Connection->getTransport()->config);
+		$transportConfig += $Connection->getTransport()->config;
+		$this->assertEquals($transportConfig, $Connection->getTransport()->config);
 	}
 
 	/**
@@ -72,7 +73,7 @@ public function constructProvider() {
 				array(
 					'persistent' => false,
 					'host' => 'localhost',
-					'protocol' => (int)6,
+
 					'port' => 80,
 					'timeout' => (int)30,
 					'ssl_verify_peer' => true,
@@ -110,7 +111,7 @@ public function constructProvider() {
 				array(
 					'persistent' => false,
 					'host' => 'localhost',
-					'protocol' => (int)6,
+
 					'port' => 80,
 					'timeout' => (int)30,
 					'ssl_verify_peer' => true,
@@ -148,7 +149,7 @@ public function constructProvider() {
 				array(
 					'persistent' => false,
 					'host' => 'localhost',
-					'protocol' => (int)6,
+
 					'port' => 80,
 					'timeout' => (int)30,
 					'ssl_verify_peer' => true,
@@ -186,7 +187,7 @@ public function constructProvider() {
 				array(
 					'persistent' => false,
 					'host' => 'example',
-					'protocol' => (int)6,
+
 					'port' => 80,
 					'timeout' => (int)30,
 					'ssl_verify_peer' => true,
@@ -227,7 +228,7 @@ public function constructProvider() {
 				array(
 					'persistent' => false,
 					'host' => 'localhost',
-					'protocol' => (int)6,
+
 					'port' => 80,
 					'timeout' => (int)30,
 					'ssl_verify_peer' => true,
@@ -273,7 +274,7 @@ public function constructProvider() {
 				array(
 					'persistent' => false,
 					'host' => 'localhost',
-					'protocol' => (int)6,
+
 					'port' => 80,
 					'timeout' => (int)30,
 					'ssl_verify_peer' => true,