Add tests for yajra#2084.

Author: yajra

tests/Integration/EloquentDataTableTest.php

@@ -5,6 +5,7 @@
 use Yajra\DataTables\DataTables;
 use Illuminate\Http\JsonResponse;
 use Yajra\DataTables\Tests\TestCase;
+use Yajra\DataTables\Tests\Models\Post;
 use Yajra\DataTables\EloquentDataTable;
 use Yajra\DataTables\Tests\Models\User;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -33,7 +34,7 @@ public function it_can_perform_global_search()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'search' => ['value' => 'Record-19'],
+            'search'  => ['value' => 'Record-19'],
         ]);
 
         $crawler->assertJson([
@@ -88,12 +89,28 @@ public function it_accepts_a_model_using_ioc_container_factory()
         $this->assertInstanceOf(JsonResponse::class, $response);
     }
 
+    /** @test */
+    public function it_returns_only_the_selected_columns_with_dotted_notation()
+    {
+        $json = $this->call('GET', '/eloquent/only')->json();
+        $this->assertArrayNotHasKey('id', $json['data'][0]);
+        $this->assertArrayHasKey('title', $json['data'][0]);
+        $this->assertArrayNotHasKey('id', $json['data'][0]['user']);
+        $this->assertArrayHasKey('name', $json['data'][0]['user']);
+    }
+
     protected function setUp(): void
     {
         parent::setUp();
 
         $this->app['router']->get('/eloquent/users', function (DataTables $datatables) {
             return $datatables->eloquent(User::query())->toJson();
         });
+
+        $this->app['router']->get('/eloquent/only', function (DataTables $datatables) {
+            return $datatables->eloquent(Post::with('user'))
+                              ->only(['title', 'user.name'])
+                              ->toJson();
+        });
     }
 }

tests/Integration/QueryDataTableTest.php

@@ -34,7 +34,7 @@ public function it_can_perform_global_search()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'search' => ['value' => 'Record-19'],
+            'search'  => ['value' => 'Record-19'],
         ]);
 
         $crawler->assertJson([
@@ -52,7 +52,7 @@ public function it_can_skip_total_records_count_query()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'search' => ['value' => 'Record-19'],
+            'search'  => ['value' => 'Record-19'],
         ]);
 
         $crawler->assertJson([
@@ -70,7 +70,7 @@ public function it_can_perform_multiple_term_global_search()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'search' => ['value' => 'Record-19 Email-19'],
+            'search'  => ['value' => 'Record-19 Email-19'],
         ]);
 
         $crawler->assertJson([
@@ -143,7 +143,7 @@ public function it_does_not_allow_search_on_added_columns()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'search' => ['value' => 'Record-19'],
+            'search'  => ['value' => 'Record-19'],
         ]);
 
         $crawler->assertJson([
@@ -153,6 +153,14 @@ public function it_does_not_allow_search_on_added_columns()
         ]);
     }
 
+    /** @test */
+    public function it_returns_only_the_selected_columns()
+    {
+        $json = $this->call('GET', '/query/only')->json();
+        $this->assertArrayNotHasKey('id', $json['data'][0]);
+        $this->assertArrayHasKey('name', $json['data'][0]);
+    }
+
     /** @test */
     public function it_does_not_allow_raw_html_on_added_columns()
     {
@@ -187,7 +195,7 @@ public function it_can_return_auto_index_column()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'search' => ['value' => 'Record-19'],
+            'search'  => ['value' => 'Record-19'],
         ]);
 
         $crawler->assertJson([
@@ -208,7 +216,7 @@ public function it_allows_search_on_added_column_with_custom_filter_handler()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'search' => ['value' => 'Record-19'],
+            'search'  => ['value' => 'Record-19'],
         ]);
 
         $crawler->assertJson([
@@ -256,6 +264,13 @@ protected function setUp(): void
                              ->toJson();
         });
 
+        $route->get('/query/only', function (DataTables $dataTable) {
+            return $dataTable->query(DB::table('users'))
+                             ->addColumn('foo', 'bar')
+                             ->only(['name'])
+                             ->toJson();
+        });
+
         $route->get('/query/xss-add', function (DataTables $dataTable) {
             return $dataTable->query(DB::table('users'))
                              ->addColumn('foo', '<a href="#">Allowed</a>')