Update unit testing.

src/ConditionsBuilder.php

@@ -238,7 +238,7 @@ private function convertOperator($operator): string
             'le'  => '<=',
         ];
 
-        return $operatorMap[$operator] ?? '=';
+        return $operatorMap[$operator] ?? $operator ?? '=';
     }
 
 

src/ServiceProvider.php

@@ -20,12 +20,12 @@ public function boot()
      */
     public function register()
     {
-        Builder::macro('advanced', function(Builder $builder, $conditions) {
-            return (new ConditionsBuilder($builder))->attach($conditions);
+        Builder::macro('advanced', function($conditions = []) {
+            return (new ConditionsBuilder($this))->attach($conditions);
         });
 
-        Request::macro('conditions', function(Request $request, $wheres) {
-            return (new ConditionsGenerator($request, $wheres))->getRequestConditions();
+        Request::macro('conditions', function($wheres = []) {
+            return (new ConditionsGenerator($this, $wheres))->getRequestConditions();
         });
     }
 }

tests/Migrations/2018_02_28_000002_create_testbench_users_table.php

@@ -14,7 +14,6 @@ public function up(): void
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('company_id')->nullable();
-            $table->unsignedInteger('team_id')->nullable();
             $table->string('name')->nullable();
             $table->string('email')->nullable();
             $table->string('password')->nullable();

tests/TestCase.php

@@ -3,6 +3,7 @@
 namespace Tests;
 
 use Orchestra\Testbench\TestCase as BaseTestCase;
+use Zhuzhichao\LaravelAdvancedSearch\ServiceProvider;
 
 abstract class TestCase extends BaseTestCase
 {
@@ -14,7 +15,9 @@ abstract class TestCase extends BaseTestCase
      */
     protected function getPackageProviders($app)
     {
-        return [];
+        return [
+            ServiceProvider::class
+        ];
     }
 
     /**

tests/Unit/ConditionsBuilder/SimpleLikeQueryTest.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Tests\Unit\ConditionsBuilder;
+
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\DB;
+use MatrixLab\LaravelAdvancedSearch\ModelScope;
+use Tests\DBTestCase;
+use Tests\Utils\Models\Company;
+use Tests\Utils\Models\Post;
+use Tests\Utils\Models\User;
+
+class SimpleLikeQueryTest extends DBTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Company::factory()->make([
+            'name' => 'this name is testing for search, first name',
+        ])->save();
+        Company::factory()->make([
+            'name' => 'this name is testing for search, double first name',
+        ])->save();
+        Company::factory()->make([
+            'name' => 'this name is testing for search, second name',
+        ])->save();
+
+        User::factory()->make([
+
+        ]);
+    }
+
+    public function test_without_scope()
+    {
+        self::assertEquals(2, Company::advanced(['wheres' => [
+            'name.like' => '%first%',
+        ]])->count());
+    }
+
+    public function test_with_cope()
+    {
+
+    }
+}

tests/Unit/ConditionsBuilder/WhereQueryTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Unit\ConditionsBuilder;
+
+use Tests\DBTestCase;
+use Tests\Utils\Models\Company;
+use Tests\Utils\Models\User;
+
+class WhereQueryTest extends DBTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        User::factory()->count(10)->create();
+        User::factory()->make([
+            'name' => 'zhuzhichao',
+            'email' => '[email protected]',
+        ])->save();
+    }
+
+    public function test_model_without_search_keyword_method()
+    {
+        self::assertEquals(Company::count(), Company::advanced([
+            'keyword' => 'Chou'
+        ])->count());
+    }
+
+    public function test_model_with_search_keyword_method()
+    {
+        self::assertEquals(1, User::advanced([
+            'keyword' => 'zhichao'
+        ])->count());
+    }
+}

tests/Utils/Models/Company.php

@@ -2,11 +2,15 @@
 
 namespace Tests\Utils\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Tests\Factories\CompanyFactory;
 
 class Company extends Model
 {
+    use HasFactory;
+
     protected $guarded = [];
 
     public function users(): HasMany
@@ -20,4 +24,9 @@ public function scopeName($query, $value)
 
         return $query;
     }
+
+    protected static function newFactory()
+    {
+        return new CompanyFactory;
+    }
 }

tests/Utils/Models/User.php

@@ -3,13 +3,17 @@
 namespace Tests\Utils\Models;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Tests\Factories\CompanyFactory;
+use Tests\Factories\UserFactory;
 
 class User extends Authenticatable
 {
     use SoftDeletes;
+    use HasFactory;
 
     /**
      * @var mixed[]
@@ -50,4 +54,9 @@ public function scopeSearchKeyword($q, $key)
 
         return $q;
     }
+
+    protected static function newFactory()
+    {
+        return new UserFactory;
+    }
 }