wip

Author: freekmurze

composer.json

@@ -50,7 +50,10 @@
         "test-coverage": "phpunit --coverage-html coverage"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     },
     "extra": {
         "laravel": {

tests/AppendTest.php

@@ -7,8 +7,6 @@
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\AppendModel;
 
-uses(TestCase::class);
-
 beforeEach(function () {
     AppendModel::factory()->count(5)->create();
 });

tests/FieldsTest.php

@@ -9,8 +9,6 @@
 use Spatie\QueryBuilder\Tests\TestClasses\Models\RelatedModel;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\TestModel;
 
-uses(TestCase::class);
-
 beforeEach(function () {
     $this->model = TestModel::factory()->create();
 

tests/FilterTest.php

@@ -12,8 +12,6 @@
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\TestModel;
 
-uses(TestCase::class);
-
 beforeEach(function () {
     $this->models = TestModel::factory()->count(5)->create();
 });
@@ -144,7 +142,7 @@
         ->allowedFilters(AllowedFilter::exact('id'))
         ->get();
 
-    expect($models)->toEqual(Result, $models);
+    expect($models)->toEqual($modelsResult, $models);
 });
 
 it('can filter and reject results by exact property', function () {
@@ -465,12 +463,3 @@ public function __invoke(Builder $query, $value, string $property): Builder
     expect($models->count())->toEqual(0);
 });
 
-// Helpers
-function createQueryFromFilterRequest(array $filters): QueryBuilder
-{
-    $request = new Request([
-        'filter' => $filters,
-    ]);
-
-    return QueryBuilder::for(TestModel::class, $request);
-}

tests/FiltersCallbackTest.php

@@ -6,8 +6,6 @@
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\TestModel;
 
-uses(TestCase::class);
-
 beforeEach(function () {
     $this->models = TestModel::factory()->count(3)->create();
 });
@@ -39,12 +37,3 @@ function filterCallback(Builder $query, $value)
 {
     $query->where('name', $value);
 }
-
-function createQueryFromFilterRequest(array $filters): QueryBuilder
-{
-    $request = new Request([
-        'filter' => $filters,
-    ]);
-
-    return QueryBuilder::for(TestModel::class, $request);
-}

tests/FiltersTrashedTest.php

@@ -5,8 +5,6 @@
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\SoftDeleteModel;
 
-uses(TestCase::class);
-
 beforeEach(function () {
     $this->models = collect([
         SoftDeleteModel::factory()->create(),
@@ -29,7 +27,7 @@
 it('can filter only trashed', function () {
     $models = createQueryFromFilterRequest([
             'trashed' => 'only',
-        ])
+        ], SoftDeleteModel::class)
         ->allowedFilters(AllowedFilter::trashed())
         ->get();
 
@@ -39,7 +37,7 @@
 it('can filter only trashed by scope directly', function () {
     $models = createQueryFromFilterRequest([
             'only_trashed' => true,
-        ])
+        ], SoftDeleteModel::class)
         ->allowedFilters(AllowedFilter::scope('only_trashed'))
         ->get();
 
@@ -49,19 +47,10 @@
 it('can filter with trashed', function () {
     $models = createQueryFromFilterRequest([
             'trashed' => 'with',
-        ])
+        ], SoftDeleteModel::class)
         ->allowedFilters(AllowedFilter::trashed())
         ->get();
 
     expect($models)->toHaveCount(3);
 });
 
-// Helpers
-function createQueryFromFilterRequest(array $filters): QueryBuilder
-{
-    $request = new Request([
-        'filter' => $filters,
-    ]);
-
-    return QueryBuilder::for(SoftDeleteModel::class, $request);
-}

tests/IncludeTest.php

@@ -13,8 +13,6 @@
 use Spatie\QueryBuilder\Tests\TestClasses\Models\MorphModel;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\TestModel;
 
-uses(TestCase::class);
-
 beforeEach(function () {
     $this->models = TestModel::factory()->count(5)->create();
 

tests/Pest.php

@@ -1,42 +1,29 @@
 <?php
 
-uses(\Spatie\QueryBuilder\Tests\TestCase::class)->in('tests', 'Concerns', 'TestClasses');
+use Illuminate\Support\Facades\DB;
+use Spatie\QueryBuilder\QueryBuilder;
+use Spatie\QueryBuilder\Tests\TestCase;
+use Illuminate\Http\Request;
+use Spatie\QueryBuilder\Tests\TestClasses\Models\TestModel;
 
-/*
-|--------------------------------------------------------------------------
-| Test Case
-|--------------------------------------------------------------------------
-|
-| The closure you provide to your test functions is always bound to a specific PHPUnit test
-| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "uses()" function to bind a different classes or traits.
-|
-*/
+uses(TestCase::class)->in(__DIR__);
 
-/** @link https://pestphp.com/docs/underlying-test-case */
+function createQueryFromFilterRequest(array $filters, string $model = null): QueryBuilder
+{
+    $model ??= TestModel::class;
 
-/*
-|--------------------------------------------------------------------------
-| Expectations
-|--------------------------------------------------------------------------
-|
-| When you're writing tests, you often need to check that values meet certain conditions. The
-| "expect()" function gives you access to a set of "expectations" methods that you can use
-| to assert different things. Of course, you may extend the Expectation API at any time.
-|
-*/
+    $request = new Request([
+        'filter' => $filters,
+    ]);
 
-/** @link https://pestphp.com/docs/expectations#custom-expectations */
+    return QueryBuilder::for($model, $request);
+}
 
-/*
-|--------------------------------------------------------------------------
-| Functions
-|--------------------------------------------------------------------------
-|
-| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
-| project that you don't want to repeat in every file. Here you can also expose helpers as
-| global functions to help you to reduce the number of lines of code in your test files.
-|
-*/
+function assertQueryExecuted(string $query)
+{
+    $queries = array_map(function ($queryLogItem) {
+        return $queryLogItem['query'];
+    }, DB::getQueryLog());
 
-/** @link https://pestphp.com/docs/helpers */
+    expect($queries)->toContain($query);
+}

tests/QueryBuilderRequestTest.php

@@ -2,8 +2,6 @@
 
 use Spatie\QueryBuilder\QueryBuilderRequest;
 
-uses(TestCase::class);
-
 it('can filter nested arrays', function () {
     $expected = [
         'info' => [

tests/QueryBuilderTest.php

@@ -13,8 +13,6 @@
 use Spatie\QueryBuilder\Tests\TestClasses\Models\SoftDeleteModel;
 use Spatie\QueryBuilder\Tests\TestClasses\Models\TestModel;
 
-uses(TestCase::class);
-
 it('can be given an eloquent query using where', function () {
     $queryBuilder = QueryBuilder::for(TestModel::where('id', 1));