Finished off tests.

readme.md

@@ -86,7 +86,5 @@ $modifier = Johnrich85\EloquentQueryModifier\EloquentQueryModifier($config, $fac
 
 ##Todo
 
-1. Test for EloquentQueryModifier.
-2. Test for custom modifiers
-3. Composer possible conflicts with laravel...
+1. Composer possible conflicts with laravel...
 

tests/BaseTest.php

@@ -144,6 +144,11 @@ protected function createCategory()
         ]);
         $cat2->save();
 
+        $cat2 = new Models\Category([
+            'name' => 'B. Another cat'
+        ]);
+        $cat2->save();
+
         $book = new Models\Book([
             'name' => 'Book 3'
         ]);

tests/EloquentQueryModifierTest.php

@@ -0,0 +1,68 @@
+<?php namespace Johnrich85\Tests;
+
+use Illuminate\Support\Facades\Input;
+use Johnrich85\EloquentQueryModifier\EloquentQueryModifier;
+use Johnrich85\EloquentQueryModifier\Factory\ModifierFactory;
+use Johnrich85\EloquentQueryModifier\FilterQuery;
+use Johnrich85\EloquentQueryModifier\InputConfig;
+use Johnrich85\EloquentQueryModifier\Tests\Mock\Models\Category;
+
+class EloquentQueryModifierTest extends \Johnrich85\Tests\BaseTest{
+
+    public function test_no_parameters_returns_expected()
+    {
+        $this->populateDatabase();
+        $modifier = $this->getEqmInstance();
+        $builder = $this->getCatQueryBuilder();
+
+        $modifier->modify($builder,[]);
+
+        $results = $builder->get();
+
+        $this->assertEquals(3, count($results));
+    }
+
+    public function test_with_multiple_default_modifiers_returns_expected()
+    {
+        $this->populateDatabase();
+
+        $modifier = $this->getEqmInstance();
+        $builder = $this->getCatQueryBuilder();
+
+        $query = new FilterQuery();
+        $query->operator = '!=';
+        $query->value = 'Cat 1';
+
+        $modifier->modify($builder,[
+            'sort' => 'name',
+            'name' => $query,
+            'fields' => 'name'
+        ]);
+
+        $results = $builder->get();
+
+        $this->assertEquals(2, count($results));
+        $this->assertEquals('Another Cat', $results[0]->name);
+        $this->assertEquals(1, count($results[0]));
+        $this->assertEquals(true, array_key_exists('name', (array) $results[0]->getAttributes()));
+    }
+
+    protected function getEqmInstance()
+    {
+        $config = new InputConfig();
+        $factory = new ModifierFactory();
+
+        $modifier = new EloquentQueryModifier($config, $factory);
+
+        return $modifier;
+    }
+
+    protected function getCatQueryBuilder()
+    {
+        $cat = new Category();
+
+        $builder = $cat->newQuery();
+
+        return $builder;
+    }
+}

tests/InputConfigTest.php

@@ -1,6 +1,7 @@
 <?php namespace Johnrich85\Tests;
 
 use Johnrich85\EloquentQueryModifier\InputConfig;
+use Johnrich85\EloquentQueryModifier\Tests\Mock\Models\Category;
 
 class InputConfigTest extends \Johnrich85\Tests\BaseTest{
 
@@ -28,4 +29,21 @@ public function testDeleteModifier()
         $this->assertEquals(4, count($modifiers));
     }
 
+    public function test_all_columns_returned()
+    {
+        $model = new Category();
+
+        $config = new InputConfig();
+
+        $config->setFilterableFields($model->query());
+
+        $columns = $config->getFilterableFields();
+
+        $this->assertEquals(4, count($columns));
+        $this->assertContains('id', $columns);
+        $this->assertContains('name', $columns);
+        $this->assertContains('created_at', $columns);
+        $this->assertContains('updated_at', $columns);
+    }
+
 }

tests/Modifiers/FilterModifierTest.php

@@ -492,7 +492,7 @@ public function test_exclude() {
         $this->assertEquals(3, $wheres[0]['values'][2]);
         $this->assertEquals('and', $wheres[0]['boolean']);
 
-        $this->assertEquals(1, count($query->get()));
+        $this->assertEquals(2, count($query->get()));
     }
 
     /**

tests/Modifiers/SearchModifierTest.php

@@ -69,7 +69,7 @@ public function test_search_wildcard() {
 
         $modifier->modify($query);
 
-        $this->assertEquals(2, count($query->get()));
+        $this->assertEquals(3, count($query->get()));
     }
 
     public function test_search_literal() {

tests/Modifiers/SortModifierTest.php

@@ -155,7 +155,7 @@ public function test_single() {
 
         $result = $query->get();
 
-        $this->assertEquals(2, count($result));
+        $this->assertEquals(3, count($result));
         $this->assertEquals('Cat 1', $result[0]->name);
     }
 
@@ -178,7 +178,7 @@ public function test_single_asc() {
 
         $result = $query->get();
 
-        $this->assertEquals(2, count($result));
+        $this->assertEquals(3, count($result));
         $this->assertEquals('Another Cat', $result[0]->name);
     }