Update tests to expect the extra request to check we can connect

Author: lornajane

src/PHPCouchDB/Server.php

@@ -52,10 +52,10 @@ public function __construct(array $options)
         } catch (\GuzzleHttp\Exception\ConnectException $e) {
             throw new \PHPCouchDB\Exception\ServerException(
                 "Could not connect to database.  Error: " . $e->getMessage(),
-                0, $e
+                0,
+                $e
             );
         }
-
     }
 
     /**

tests/PHPCouchDB/ServerTest.php

@@ -36,7 +36,7 @@ public function testGetVersion() {
 		$response1 = new Response(200, [], $couchdb1);
 
 		// Create a mock and queue two responses.
-		$mock = new MockHandler([ $response1 ]);
+		$mock = new MockHandler([ $response1, $response1 ]);
 
 		$handler = HandlerStack::create($mock);
 		$client = new Client(['handler' => $handler]);
@@ -48,10 +48,13 @@ public function testGetVersion() {
     }
 
     public function testGetAllDbs() {
+		$couchdb1 = '{"couchdb":"Welcome","uuid":"fce3d5aabfe189c988273c0ffa8d375b","version":"1.6.0","vendor":{"name":"Ubuntu","version":"15.10"}}';
+		$db_response = new Response(200, [], $couchdb1);
+
         $dbs = ["test", "items"];
         $response1 = new Response(200, [], json_encode($dbs));
 
-        $mock = new MockHandler([ $response1 ]);
+        $mock = new MockHandler([ $db_response, $response1 ]);
 		$handler = HandlerStack::create($mock);
 		$client = new Client(['handler' => $handler]);
 
@@ -62,10 +65,13 @@ public function testGetAllDbs() {
     }
 
     public function testUseADbThatDoesExist() {
+		$couchdb1 = '{"couchdb":"Welcome","uuid":"fce3d5aabfe189c988273c0ffa8d375b","version":"1.6.0","vendor":{"name":"Ubuntu","version":"15.10"}}';
+		$db_response = new Response(200, [], $couchdb1);
+
         $egdb1 = '{"db_name":"egdb","update_seq":"0-g1AAAABXeJzLYWBgYMpgTmEQTM4vTc5ISXLIyU9OzMnILy7JAUklMiTV____PyuRAY-iPBYgydAApP5D1GYBAJmvHGw","sizes":{"file":8488,"external":0,"active":0},"purge_seq":0,"other":{"data_size":0},"doc_del_count":0,"doc_count":0,"disk_size":8488,"disk_format_version":6,"data_size":0,"compact_running":false,"instance_start_time":"0"}';
         $response1 = new Response(200, [], $egdb1);
 
-        $mock = new MockHandler([ $response1 ]);
+        $mock = new MockHandler([ $db_response, $response1 ]);
 		$handler = HandlerStack::create($mock);
 		$client = new Client(['handler' => $handler]);
 
@@ -75,10 +81,13 @@ public function testUseADbThatDoesExist() {
     }
 
     public function testUseADbWithCreateThatDoesExist() {
+		$couchdb1 = '{"couchdb":"Welcome","uuid":"fce3d5aabfe189c988273c0ffa8d375b","version":"1.6.0","vendor":{"name":"Ubuntu","version":"15.10"}}';
+		$db_response = new Response(200, [], $couchdb1);
+
         $egdb1 = '{"db_name":"egdb","update_seq":"0-g1AAAABXeJzLYWBgYMpgTmEQTM4vTc5ISXLIyU9OzMnILy7JAUklMiTV____PyuRAY-iPBYgydAApP5D1GYBAJmvHGw","sizes":{"file":8488,"external":0,"active":0},"purge_seq":0,"other":{"data_size":0},"doc_del_count":0,"doc_count":0,"disk_size":8488,"disk_format_version":6,"data_size":0,"compact_running":false,"instance_start_time":"0"}';
         $response1 = new Response(200, [], $egdb1);
 
-        $mock = new MockHandler([ $response1 ]);
+        $mock = new MockHandler([ $db_response, $response1 ]);
 		$handler = HandlerStack::create($mock);
 		$client = new Client(['handler' => $handler]);
 
@@ -91,10 +100,13 @@ public function testUseADbWithCreateThatDoesExist() {
      * @expectedException       \PHPCouchDB\Exception\ServerException
      */
     public function testUseADbThatDoesNotExist() {
+		$couchdb1 = '{"couchdb":"Welcome","uuid":"fce3d5aabfe189c988273c0ffa8d375b","version":"1.6.0","vendor":{"name":"Ubuntu","version":"15.10"}}';
+		$db_response = new Response(200, [], $couchdb1);
+
         $egdb1 = '{"error":"not_found","reason":"Database does not exist."}';
         $response1 = new Response(404, [], $egdb1);
 
-        $mock = new MockHandler([ $response1 ]);
+        $mock = new MockHandler([ $db_response, $response1 ]);
 		$handler = HandlerStack::create($mock);
 		$client = new Client(['handler' => $handler]);
 
@@ -104,13 +116,16 @@ public function testUseADbThatDoesNotExist() {
     }
 
     public function testUseADbWithCreateThatDoesNotExist() {
+		$couchdb1 = '{"couchdb":"Welcome","uuid":"fce3d5aabfe189c988273c0ffa8d375b","version":"1.6.0","vendor":{"name":"Ubuntu","version":"15.10"}}';
+		$db_response = new Response(200, [], $couchdb1);
+
         $egdb1 = '{"error":"not_found","reason":"Database does not exist."}';
         $response1 = new Response(404, [], $egdb1);
 
         $egdb2 = '{"ok":true}';
         $response2 = new Response(201, [], $egdb2);
 
-        $mock = new MockHandler([ $response1, $response2 ]);
+        $mock = new MockHandler([ $db_response, $response1, $response2 ]);
 		$handler = HandlerStack::create($mock);
 		$client = new Client(['handler' => $handler]);