refactor tests

Author: freekmurze

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-query-builder` will be documented in this file
 
+## 1.9.2 - 2018-5-21
+
+- prevent double sorting statments
+
 ## 1.9.1 - 2018-05-15
 
 - improvements around field selection

tests/SortTest.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\QueryBuilder\Tests;
 
+use DB;
 use Illuminate\Http\Request;
 use Spatie\QueryBuilder\QueryBuilder;
 use Spatie\QueryBuilder\Tests\Models\TestModel;
@@ -20,31 +21,31 @@ public function setUp()
     {
         parent::setUp();
 
+        DB::enableQueryLog();
+
         $this->models = factory(TestModel::class, 5)->create();
         $this->modelTableName = $this->models->first()->getTable();
     }
 
     /** @test */
     public function it_can_sort_a_collection_ascending()
     {
-        \DB::enableQueryLog();
         $sortedModels = $this
             ->createQueryFromSortRequest('name')
             ->get();
 
-        $this->assertSame(\DB::getQueryLog()[0]['query'], 'select "test_models".* from "test_models" order by "name" asc');
+        $this->assertQueryExecuted('select "test_models".* from "test_models" order by "name" asc');
         $this->assertSortedAscending($sortedModels, 'name');
     }
 
     /** @test */
     public function it_can_sort_a_collection_descending()
     {
-        \DB::enableQueryLog();
         $sortedModels = $this
             ->createQueryFromSortRequest('-name')
             ->get();
 
-        $this->assertSame(\DB::getQueryLog()[0]['query'], 'select "test_models".* from "test_models" order by "name" desc');
+        $this->assertQueryExecuted('select "test_models".* from "test_models" order by "name" desc');
         $this->assertSortedDescending($sortedModels, 'name');
     }
 
@@ -93,26 +94,25 @@ public function it_wont_sort_if_no_sort_query_parameter_is_given()
     /** @test */
     public function it_uses_default_sort_parameter()
     {
-        \DB::enableQueryLog();
         $sortedModels = QueryBuilder::for(TestModel::class, new Request())
             ->allowedSorts('name')
             ->defaultSort('name')
             ->get();
 
-        $this->assertSame(\DB::getQueryLog()[0]['query'], 'select "test_models".* from "test_models" order by "name" asc');
+        $this->assertQueryExecuted('select "test_models".* from "test_models" order by "name" asc');
         $this->assertSortedAscending($sortedModels, 'name');
     }
 
     /** @test */
     public function it_can_allow_multiple_sort_parameters()
     {
-        \DB::enableQueryLog();
+        DB::enableQueryLog();
         $sortedModels = $this
             ->createQueryFromSortRequest('name')
             ->allowedSorts('id', 'name')
             ->get();
 
-        $this->assertSame(\DB::getQueryLog()[0]['query'], 'select "test_models".* from "test_models" order by "name" asc');
+        $this->assertQueryExecuted('select "test_models".* from "test_models" order by "name" asc');
         $this->assertSortedAscending($sortedModels, 'name');
     }
 
@@ -131,15 +131,14 @@ public function it_can_allow_multiple_sort_parameters_as_an_array()
     public function it_can_sort_by_multiple_columns()
     {
         factory(TestModel::class, 3)->create(['name' => 'foo']);
-        \DB::enableQueryLog();
 
         $sortedModels = $this
             ->createQueryFromSortRequest('name,-id')
             ->allowedSorts('name', 'id')
             ->get();
 
         $expected = TestModel::orderBy('name')->orderByDesc('id');
-        $this->assertSame(\DB::getQueryLog()[0]['query'], 'select "test_models".* from "test_models" order by "name" asc, "id" desc');
+        $this->assertQueryExecuted('select "test_models".* from "test_models" order by "name" asc, "id" desc');
         $this->assertEquals($expected->pluck('id'), $sortedModels->pluck('id'));
     }
 
@@ -151,4 +150,13 @@ protected function createQueryFromSortRequest(string $sort): QueryBuilder
 
         return QueryBuilder::for(TestModel::class, $request);
     }
+
+    protected function assertQueryExecuted(string $query)
+    {
+        $queries = array_map(function($queryLogItem) {
+            return $queryLogItem['query'];
+        }, DB::getQueryLog());
+
+        $this->assertContains($query, $queries);
+    }
 }