Fixed insert return type and tweaked some tests

Author: jenssegers

src/Jenssegers/Mongodb/Query/Builder.php

@@ -338,7 +338,7 @@ public function insert(array $values)
             $this->from . '.batchInsert(' . json_encode($values) . ')',
             array(), $this->connection->getElapsedTime($start));
 
-        return $result;
+        return (1 == (int) $result['ok']);
     }
 
     /**

tests/ModelTest.php

@@ -274,22 +274,11 @@ public function testScope()
 
 	public function testToArray()
 	{
-		$original = array(
-			array('name' => 'knife', 'type' => 'sharp'),
-			array('name' => 'spoon', 'type' => 'round')
-		);
-
-		Item::insert($original);
-
-		$items = Item::all();
-		$this->assertEquals($original, $items->toArray());
-		$this->assertEquals($original[0], $items[0]->toArray());
-
-		// with date
 		$item = Item::create(array('name' => 'fork', 'type' => 'sharp'));
+
 		$array = $item->toArray();
-		$this->assertTrue(array_key_exists('created_at', $array));
-		$this->assertTrue(array_key_exists('updated_at', $array));
+		$keys = array_keys($array); sort($keys);
+		$this->assertEquals(array('_id', 'created_at', 'name', 'type', 'updated_at'), $keys);
 		$this->assertTrue(is_string($array['created_at']));
 		$this->assertTrue(is_string($array['updated_at']));
 	}

tests/QueryBuilderTest.php

@@ -271,11 +271,13 @@ public function testDistinct()
 			array('name' => 'spoon', 'type' => 'round')
 		));
 
-		$items = DB::collection('items')->distinct('name')->get();
-		$this->assertEquals(array('knife', 'fork', 'spoon'), $items);
+		$items = DB::collection('items')->distinct('name')->get(); sort($items);
+		$this->assertEquals(3, count($items));
+		$this->assertEquals(array('fork', 'knife', 'spoon'), $items);
 
-		$types = DB::collection('items')->distinct('type')->get();
-		$this->assertEquals(array('sharp', 'round'), $types);
+		$types = DB::collection('items')->distinct('type')->get(); sort($types);
+		$this->assertEquals(2, count($types));
+		$this->assertEquals(array('round', 'sharp'), $types);
 	}
 
 	public function testCustomId()
@@ -350,9 +352,11 @@ public function testList()
 		));
 
 		$list = DB::collection('items')->lists('name');
+		$this->assertEquals(4, count($list));
 		$this->assertEquals(array('knife', 'fork', 'spoon', 'spoon'), $list);
 
 		$list = DB::collection('items')->lists('type', 'name');
+		$this->assertEquals(3, count($list));
 		$this->assertEquals(array('knife' => 'sharp', 'fork' => 'sharp', 'spoon' => 'round'), $list);
 	}