Merge pull request #138 from leroy-merlin-br/update-one-by-query

Fix Bulk Writefilter handler
leroy-merlin-br · Nov 12, 2018 · 56005ec · 56005ec
2 parents d256cef + f6ac773
commit 56005ec
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/src/Mongolid/DataMapper/BulkWrite.php b/src/Mongolid/DataMapper/BulkWrite.php
@@ -92,7 +92,7 @@ public function updateOne(
         array $options = ['upsert' => true],
         string $operator = '$set'
     ) {
-        $filter = is_array($filter) ?: ['_id' => $filter];
+        $filter = is_array($filter) ? $filter : ['_id' => $filter];
 
         return $this->getBulkWrite()->update(
             $filter,

diff --git a/tests/Mongolid/DataMapper/BulkWriteTest.php b/tests/Mongolid/DataMapper/BulkWriteTest.php
@@ -97,9 +97,19 @@ public function testShouldUpdateOneWithUnsetOperationToBulkWrite()
             ->withNoArgs()
             ->once();
 
-        $mongoBulkWrite->shouldReceive('update')
-            ->with(['_id' => $id], ['$unset' => $data], ['upsert' => true])
-            ->once();
+        $mongoBulkWrite->expects()
+            ->update(
+                m::on(
+                    function ($actual) {
+                        $this->assertSame(['_id' => '123'], $actual);
+
+                        return true;
+                    }
+                ),
+                ['$unset' => $data],
+                ['upsert' => true]
+            );
+
 
         $bulkWrite = m::mock(BulkWrite::class.'[getBulkWrite]', [$entity]);
 
@@ -126,9 +136,18 @@ public function testShouldUpdateOneWithQueryOnFilterToBulkWrite()
             ->withNoArgs()
             ->once();
 
-        $mongoBulkWrite->shouldReceive('update')
-            ->with($query, ['$unset' => $data], ['upsert' => true])
-            ->once();
+        $mongoBulkWrite->expects()
+            ->update(
+                m::on(
+                    function ($actual) use ($query) {
+                        $this->assertSame($query, $actual);
+
+                        return true;
+                    }
+                ),
+                ['$unset' => $data],
+                ['upsert' => true]
+            );
 
         $bulkWrite = m::mock(BulkWrite::class.'[getBulkWrite]', [$entity]);