Fix integration tests

mongodb · Nov 21, 2024 · 4afc618 · 4afc618
1 parent 4647cf0
commit 4afc618
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 55 deletions.
diff --git a/src/Scout/ScoutEngine.php b/src/Scout/ScoutEngine.php
@@ -234,14 +234,14 @@ protected function performSearch(Builder $builder, ?int $offset = null): array
             ],
         ];
 
-        if ($builder->limit) {
-            $pipeline[] = ['$limit' => $builder->limit];
-        }
-
         if ($offset) {
             $pipeline[] = ['$skip' => $offset];
         }
 
+        if ($builder->limit) {
+            $pipeline[] = ['$limit' => $builder->limit];
+        }
+
         $options = [
             'allowDiskUse' => true,
             'typeMap' => ['root' => 'object', 'document' => 'array', 'array' => 'array'],

diff --git a/tests/Models/SqlUser.php b/tests/Models/SqlUser.php
@@ -11,6 +11,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Schema\SQLiteBuilder;
 use Illuminate\Support\Facades\Schema;
+use Laravel\Scout\Searchable;
 use MongoDB\Laravel\Eloquent\HybridRelations;
 use MongoDB\Laravel\Relations\MorphToMany;
 
@@ -19,6 +20,7 @@
 class SqlUser extends EloquentModel
 {
     use HybridRelations;
+    use Searchable;
 
     protected $connection = 'sqlite';
     protected $table = 'users';
@@ -66,6 +68,10 @@ public static function executeSchema(): void
         $schema->create('users', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name');
+            $table->string('email')->nullable();
+            $table->date('email_verified_at')->nullable();
+            $table->string('password')->nullable();
+            $table->string('remember_token')->nullable();
             $table->timestamps();
         });
 

diff --git a/tests/Scout/ScoutEngineTest.php b/tests/Scout/ScoutEngineTest.php
@@ -360,10 +360,10 @@ public function testPaginate()
                         ],
                     ],
                     [
-                        '$limit' => 5,
+                        '$skip' => 10,
                     ],
                     [
-                        '$skip' => 10,
+                        '$limit' => 5,
                     ],
                 ], $args[0]);
 

diff --git a/tests/Scout/ScoutIntegrationTest.php b/tests/Scout/ScoutIntegrationTest.php
@@ -2,7 +2,7 @@
 
 namespace MongoDB\Laravel\Tests\Scout;
 
-use MongoDB\Laravel\Tests\Models\User;
+use MongoDB\Laravel\Tests\Models\SqlUser;
 use MongoDB\Laravel\Tests\TestCase;
 
 use function class_exists;
@@ -34,7 +34,7 @@ protected function defineScoutDatabaseMigrations()
     {
         $this->baseDefineScoutDatabaseMigrations();
 
-        $this->importScoutIndexFrom(User::class);
+        $this->importScoutIndexFrom(SqlUser::class);
     }
 
     protected function importScoutIndexFrom($model = null)
@@ -50,7 +50,7 @@ protected function importScoutIndexFrom($model = null)
 
     protected function tearDown(): void
     {
-        self::assertSame(0, artisan($this, 'scout:delete-index', ['name' => User::class]));
+        self::assertSame(0, artisan($this, 'scout:delete-index', ['name' => SqlUser::class]));
 
         parent::tearDown();
     }
@@ -60,23 +60,19 @@ public function testItCanUseBasicSearch()
         $results = $this->itCanUseBasicSearch();
 
         $this->assertSame([
-            'Larry Casper',
-            'Dax Larkin',
-            'Prof. Larry Prosacco DVM',
-            'Amos Larson Sr.',
-            'Dana Larson Sr.',
-        ], $results->pluck('name')->all());
+            11 => 'Larry Casper',
+            42 => 'Dax Larkin',
+            20 => 'Prof. Larry Prosacco DVM',
+            43 => 'Dana Larson Sr.',
+            44 => 'Amos Larson Sr.',
+        ], $results->pluck('name', 'id')->all());
     }
 
     public function testItCanUseBasicSearchWithQueryCallback()
     {
         $results = $this->itCanUseBasicSearchWithQueryCallback();
 
         $this->assertSame([
-            1 => 'Laravel Framework',
-            12 => 'Reta Larkin',
-            40 => 'Otis Larson MD',
-            41 => 'Gudrun Larkin',
             42 => 'Dax Larkin',
             43 => 'Dana Larson Sr.',
             44 => 'Amos Larson Sr.',
@@ -88,16 +84,11 @@ public function testItCanUseBasicSearchToFetchKeys()
         $results = $this->itCanUseBasicSearchToFetchKeys();
 
         $this->assertSame([
-            1,
             11,
-            12,
-            39,
-            40,
-            41,
             42,
+            20,
             43,
             44,
-            20,
         ], $results->all());
     }
 
@@ -106,16 +97,11 @@ public function testItCanUseBasicSearchWithQueryCallbackToFetchKeys()
         $results = $this->itCanUseBasicSearchWithQueryCallbackToFetchKeys();
 
         $this->assertSame([
-            1,
             11,
-            12,
-            39,
-            40,
-            41,
             42,
+            20,
             43,
             44,
-            20,
         ], $results->all());
     }
 
@@ -132,35 +118,26 @@ public function testItCanUsePaginatedSearch()
         [$page1, $page2] = $this->itCanUsePaginatedSearch();
 
         $this->assertSame([
-            'Larry Casper',
-            'Dax Larkin',
-            'Prof. Larry Prosacco DVM',
-            'Amos Larson Sr.',
-            'Dana Larson Sr.',
+            11 => 'Larry Casper',
+            42 => 'Dax Larkin',
+            20 => 'Prof. Larry Prosacco DVM',
         ], $page1->pluck('name', 'id')->all());
 
         $this->assertSame([
-            41 => 'Gudrun Larkin',
-            42 => 'Dax Larkin',
             43 => 'Dana Larson Sr.',
             44 => 'Amos Larson Sr.',
-            20 => 'Prof. Larry Prosacco DVM',
-        ], $page2->pluck('name')->all());
+        ], $page2->pluck('name', 'id')->all());
     }
 
     public function testItCanUsePaginatedSearchWithQueryCallback()
     {
         [$page1, $page2] = $this->itCanUsePaginatedSearchWithQueryCallback();
 
         $this->assertSame([
-            1 => 'Laravel Framework',
-            12 => 'Reta Larkin',
-            40 => 'Otis Larson MD',
+            42 => 'Dax Larkin',
         ], $page1->pluck('name', 'id')->all());
 
         $this->assertSame([
-            41 => 'Gudrun Larkin',
-            42 => 'Dax Larkin',
             43 => 'Dana Larson Sr.',
             44 => 'Amos Larson Sr.',
         ], $page2->pluck('name', 'id')->all());
@@ -170,4 +147,9 @@ protected static function scoutDriver(): string
     {
         return 'mongodb';
     }
+
+    protected function getUserModel(): string
+    {
+        return SqlUser::class;
+    }
 }
diff --git a/tests/Scout/SearchableTests.php b/tests/Scout/SearchableTests.php
@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Factories\Sequence;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\LazyCollection;
-use MongoDB\Laravel\Tests\Models\User;
+use MongoDB\Laravel\Tests\Models\SqlUser;
 use Orchestra\Testbench\Factories\UserFactory;
 
 use function range;
@@ -23,6 +23,8 @@ trait SearchableTests
     protected function defineScoutEnvironment($app)
     {
         $app['config']->set('scout.driver', static::scoutDriver());
+        $app['config']->set('scout.prefix', 'scout_');
+        $app['config']->set('auth.providers.users.model', SqlUser::class);
     }
 
     /**
@@ -32,6 +34,8 @@ protected function defineScoutDatabaseMigrations(): void
     {
         $this->loadLaravelMigrations();
 
+        SqlUser::executeSchema();
+
         $collect = LazyCollection::make(function () {
             yield ['name' => 'Laravel Framework'];
 
@@ -68,33 +72,33 @@ protected function defineScoutDatabaseMigrations(): void
 
     protected function itCanUseBasicSearch()
     {
-        return User::search('lar')->take(10)->get();
+        return SqlUser::search('lar')->take(10)->get();
     }
 
     protected function itCanUseBasicSearchWithQueryCallback()
     {
-        return User::search('lar')->take(10)->query(function ($query) {
+        return SqlUser::search('lar')->take(10)->query(function ($query) {
             return $query->whereNotNull('email_verified_at');
         })->get();
     }
 
     protected function itCanUseBasicSearchToFetchKeys()
     {
-        return User::search('lar')->take(10)->keys();
+        return SqlUser::search('lar')->take(10)->keys();
     }
 
     protected function itCanUseBasicSearchWithQueryCallbackToFetchKeys()
     {
-        return User::search('lar')->take(10)->query(function ($query) {
+        return SqlUser::search('lar')->take(10)->query(function ($query) {
             return $query->whereNotNull('email_verified_at');
         })->keys();
     }
 
     protected function itCanUsePaginatedSearch()
     {
         return [
-            User::search('lar')->take(10)->paginate(5, 'page', 1),
-            User::search('lar')->take(10)->paginate(5, 'page', 2),
+            SqlUser::search('lar')->take(10)->paginate(3, 'page', 1),
+            SqlUser::search('lar')->take(10)->paginate(3, 'page', 2),
         ];
     }
 
@@ -105,8 +109,8 @@ protected function itCanUsePaginatedSearchWithQueryCallback()
         };
 
         return [
-            User::search('lar')->take(10)->query($queryCallback)->paginate(5, 'page', 1),
-            User::search('lar')->take(10)->query($queryCallback)->paginate(5, 'page', 2),
+            SqlUser::search('lar')->take(10)->query($queryCallback)->paginate(3, 'page', 1),
+            SqlUser::search('lar')->take(10)->query($queryCallback)->paginate(3, 'page', 2),
         ];
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -48,7 +48,7 @@ protected function getEnvironmentSetUp($app): void
         $app['config']->set('database.connections.mongodb2', $config['connections']['mongodb']);
 
         $app['config']->set('auth.model', User::class);
-        $app['config']->set('auth.providers.users.model', User::class);
+        $app['config']->set('auth.providers.users.model', static::getUserModel());
         $app['config']->set('cache.driver', 'array');
 
         $app['config']->set('cache.stores.mongodb', [
@@ -70,4 +70,10 @@ protected function getEnvironmentSetUp($app): void
         $app['config']->set('scout.driver', 'mongodb');
         $app['config']->set('scout.prefix', 'scout_');
     }
+
+    /** @return class-string<\Illuminate\Foundation\Auth\User> */
+    protected function getUserModel(): string
+    {
+        return User::class;
+    }
 }