Update tests

mongodb · Jan 14, 2025 · b22192b · b22192b
1 parent 1ae5af1
commit b22192b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/src/Scout/ScoutEngine.php b/src/Scout/ScoutEngine.php
@@ -17,7 +17,6 @@
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Collection as MongoDBCollection;
 use MongoDB\Database;
-use MongoDB\Driver\Cursor;
 use MongoDB\Driver\CursorInterface;
 use MongoDB\Exception\RuntimeException as MongoDBRuntimeException;
 use MongoDB\Laravel\Connection;
@@ -311,9 +310,9 @@ public function mapIds($results): Collection
      *
      * @see Engine::map()
      *
-     * @param Builder      $builder
-     * @param array|Cursor $results
-     * @param Model        $model
+     * @param Builder $builder
+     * @param array   $results
+     * @param Model   $model
      *
      * @return Collection
      */
@@ -328,9 +327,9 @@ public function map(Builder $builder, $results, $model): Collection
      *
      * @see Engine::lazyMap()
      *
-     * @param Builder      $builder
-     * @param array|Cursor $results
-     * @param Model        $model
+     * @param Builder $builder
+     * @param array   $results
+     * @param Model   $model
      *
      * @return LazyCollection
      */

diff --git a/tests/Scout/ScoutEngineTest.php b/tests/Scout/ScoutEngineTest.php
@@ -266,7 +266,7 @@ function () {
                     '$search' => [
                         'compound' => [
                             'filter' => [
-                                ['equals' => ['path' => '__soft_deleted', 'value' => 0]],
+                                ['equals' => ['path' => '__soft_deleted', 'value' => false]],
                             ],
                         ],
                     ],
@@ -286,7 +286,7 @@ function () {
                     '$search' => [
                         'compound' => [
                             'filter' => [
-                                ['equals' => ['path' => '__soft_deleted', 'value' => 1]],
+                                ['equals' => ['path' => '__soft_deleted', 'value' => true]],
                             ],
                         ],
                     ],
@@ -493,20 +493,24 @@ public function testUpdateWithSoftDelete(): void
             ->andReturn($collection);
         $collection->shouldReceive('bulkWrite')
             ->once()
-            ->with([
-                [
-                    'updateOne' => [
-                        ['_id' => 'key_1'],
-                        ['$setOnInsert' => ['_id' => 'key_1'], '$set' => ['id' => 1]],
-                        ['upsert' => true],
+            ->withArgs(function ($pipeline) {
+                $this->assertSame([
+                    [
+                        'updateOne' => [
+                            ['_id' => 'key_1'],
+                            ['$setOnInsert' => ['_id' => 'key_1'], '$set' => ['id' => 1, '__soft_deleted' => false]],
+                            ['upsert' => true],
+                        ],
                     ],
-                ],
-            ]);
+                ], $pipeline);
+
+                return true;
+            });
 
         $model = new SearchableModel(['id' => 1]);
         $model->delete();
 
-        $engine = new ScoutEngine($database, softDelete: false);
+        $engine = new ScoutEngine($database, softDelete: true);
         $engine->update(EloquentCollection::make([$model]));
     }
 

diff --git a/tests/Scout/ScoutIntegrationTest.php b/tests/Scout/ScoutIntegrationTest.php
@@ -42,6 +42,8 @@ public function setUp(): void
     {
         parent::setUp();
 
+        $this->skipIfSearchIndexManagementIsNotSupported();
+
         // Init the SQL database with some objects that will be indexed
         // Test data copied from Laravel Scout tests
         // https://github.com/laravel/scout/blob/10.x/tests/Integration/SearchableTests.php
@@ -88,8 +90,6 @@ public function setUp(): void
     /** This test create the search index for tests performing search */
     public function testItCanCreateTheCollection()
     {
-        $this->skipIfSearchIndexManagementIsNotSupported();
-
         $collection = DB::connection('mongodb')->getCollection('prefix_scout_users');
         $collection->drop();
 
@@ -111,7 +111,7 @@ public function testItCanCreateTheCollection()
                 ['$search' => ['index' => 'scout', 'exists' => ['path' => 'name']]],
             ])->toArray();
 
-            if (count($indexedDocuments) > 0) {
+            if (count($indexedDocuments) >= 44) {
                 break;
             }