head + 404 is not error #43

imsamurai · Dec 10, 2014 · 71ed787 · 71ed787
1 parent 9eceb6a
commit 71ed787
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/Model/Datasource/HttpSourceConnection.php b/Model/Datasource/HttpSourceConnection.php
@@ -300,6 +300,8 @@ public function request($request = array()) {
 
 		if (!$this->_Response) {
 			$response = false;
+		} elseif (!$this->_Response->isOk() && $request['method'] === HttpSource::HTTP_METHOD_CHECK) {
+			$response = false;
 		} elseif (!$this->_Response->isOk()) {
 			$this->_error = $this->_extractRemoteError();
 			$response = false;

diff --git a/Test/Case/Model/Datasource/HttpSourceConnectionTest.php b/Test/Case/Model/Datasource/HttpSourceConnectionTest.php
@@ -801,7 +801,9 @@ public function requestProvider() {
 			//set #1
 			array(
 				//request
-				array(),
+				array(
+					'method' => HttpSource::HTTP_METHOD_READ
+				),
 				//response
 				false,
 				//data
@@ -978,6 +980,30 @@ public function requestProvider() {
 				//authMethod
 				null
 			),
+			//set #8
+			array(
+				//request
+				array(
+					'method' => HttpSource::HTTP_METHOD_CHECK
+				),
+				//response
+				false,
+				//data
+				array(
+					'isOk' => false,
+					'data' => '',
+					'reasonPhrase' => '',
+					'Content-Type' => 'application/json',
+					'error' => '',
+					'noResponse' => false,
+					'requestRaw' => '',
+					'requestQuery' => '',
+				),
+				//config
+				array(),
+				//authMethod
+				null
+			),
 		);
 	}