Merge Kyslik#53 & add test

zygimantas-gylys · Mar 14, 2017 · bbda0dd · bbda0dd
1 parent 017d3ff
commit bbda0dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "kyslik/column-sortable",
-  "description": "Package for handling column sorting in Laravel 5",
+  "description": "Package for handling column sorting in Laravel 5.4",
   "keywords": [
     "sortable",
     "sorting",
@@ -32,5 +32,6 @@
       "Kyslik\\ColumnSortable\\": "src/ColumnSortable/"
     }
   },
-  "minimum-stability": "dev"
+  "minimum-stability": "dev",
+  "prefer-stable": true
 }
diff --git a/src/ColumnSortable/SortableLink.php b/src/ColumnSortable/SortableLink.php
@@ -23,7 +23,7 @@ public static function render(array $parameters)
         list($sortColumn, $sortParameter, $title, $queryParameters) = self::parseParameters($parameters);
 
         $title = self::applyFormatting($title);
-        
+
         if ($mergeTitleAs = Config::get('columnsortable.inject_title_as', null)) {
             Request::merge([$mergeTitleAs => $title]);
         }

diff --git a/tests/SortableLinkTest.php b/tests/SortableLinkTest.php
@@ -2,7 +2,6 @@
 
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Request;
-use Kyslik\ColumnSortable\Exceptions\ColumnSortableException;
 use Kyslik\ColumnSortable\SortableLink;
 
 /**
@@ -11,6 +10,13 @@
 class SortableLinkTest extends \Orchestra\Testbench\TestCase
 {
 
+    public function testSomething()
+    {
+        Request::replace(['key' => 0, 'another-key' => null, 'another-one' => 1]);
+        $link = SortableLink::render(['column']);
+        $this->assertTrue(str_contains($link, ['key=0', 'another-key=null', 'another-one=1']));
+    }
+
     public function testInjectTitleInQueryStrings()
     {
         Config::set('columnsortable.inject_title_as', 'title');