Merge pull request #242

Author: jmikola

tests/Collection/CollectionFunctionalTest.php

@@ -127,7 +127,7 @@ public function testFindOne()
         $this->assertSameDocument($expected, $this->collection->findOne($filter, $options));
     }
 
-    public function testWithOptionsInheritsReadPreferenceAndWriteConcern()
+    public function testWithOptionsInheritsOptions()
     {
         $collectionOptions = [
             'readConcern' => new ReadConcern(ReadConcern::LOCAL),
@@ -140,6 +140,9 @@ public function testWithOptionsInheritsReadPreferenceAndWriteConcern()
         $clone = $collection->withOptions();
         $debug = $clone->__debugInfo();
 
+        $this->assertSame($this->manager, $debug['manager']);
+        $this->assertSame($this->getDatabaseName(), $debug['databaseName']);
+        $this->assertSame($this->getCollectionName(), $debug['collectionName']);
         $this->assertInstanceOf('MongoDB\Driver\ReadConcern', $debug['readConcern']);
         $this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
         $this->assertInstanceOf('MongoDB\Driver\ReadPreference', $debug['readPreference']);
@@ -150,7 +153,7 @@ public function testWithOptionsInheritsReadPreferenceAndWriteConcern()
         $this->assertSame(WriteConcern::MAJORITY, $debug['writeConcern']->getW());
     }
 
-    public function testWithOptionsPassesReadPreferenceAndWriteConcern()
+    public function testWithOptionsPassesOptions()
     {
         $collectionOptions = [
             'readConcern' => new ReadConcern(ReadConcern::LOCAL),

tests/Database/DatabaseFunctionalTest.php

@@ -139,8 +139,9 @@ public function testGetSelectsCollectionAndInheritsOptions()
         $collection = $database->{$this->getCollectionName()};
         $debug = $collection->__debugInfo();
 
-        $this->assertSame($this->getCollectionName(), $debug['collectionName']);
+        $this->assertSame($this->manager, $debug['manager']);
         $this->assertSame($this->getDatabaseName(), $debug['databaseName']);
+        $this->assertSame($this->getCollectionName(), $debug['collectionName']);
         $this->assertInstanceOf('MongoDB\Driver\WriteConcern', $debug['writeConcern']);
         $this->assertSame(WriteConcern::MAJORITY, $debug['writeConcern']->getW());
     }
@@ -158,6 +159,9 @@ public function testSelectCollectionInheritsOptions()
         $collection = $database->selectCollection($this->getCollectionName());
         $debug = $collection->__debugInfo();
 
+        $this->assertSame($this->manager, $debug['manager']);
+        $this->assertSame($this->getDatabaseName(), $debug['databaseName']);
+        $this->assertSame($this->getCollectionName(), $debug['collectionName']);
         $this->assertInstanceOf('MongoDB\Driver\ReadConcern', $debug['readConcern']);
         $this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
         $this->assertInstanceOf('MongoDB\Driver\ReadPreference', $debug['readPreference']);
@@ -252,6 +256,8 @@ public function testWithOptionsInheritsOptions()
         $clone = $database->withOptions();
         $debug = $clone->__debugInfo();
 
+        $this->assertSame($this->manager, $debug['manager']);
+        $this->assertSame($this->getDatabaseName(), $debug['databaseName']);
         $this->assertInstanceOf('MongoDB\Driver\ReadConcern', $debug['readConcern']);
         $this->assertSame(ReadConcern::LOCAL, $debug['readConcern']->getLevel());
         $this->assertInstanceOf('MongoDB\Driver\ReadPreference', $debug['readPreference']);