Skip to content

Commit

Permalink
fixed wrong data type in the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@n1crack
n1crack committed Aug 3, 2019
1 parent 9cece2f commit f443075
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 52 deletions.
50 changes: 25 additions & 25 deletions tests/spec/DatatablesSpec.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ public function it_filters_data_via_global_search()
$this->request->query->set('search', ['value' => 'doe']);

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select name, surname from mytable');
Expand All @@ -146,9 +146,9 @@ public function it_sorts_data_via_sorting()
$this->request->query->set('order', [['column' => '1', 'dir' => 'desc']]); //surname-desc

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select name, surname, age from mytable');
Expand All @@ -163,8 +163,8 @@ public function it_sorts_excluding_hidden_columns()
$this->request->query->set('order', [['column' => '1', 'dir' => 'asc']]); // age - asc

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -181,8 +181,8 @@ public function it_sorts_excluding_hidden_columns_object_data()
$this->request->query->set('order', [['column' => '1', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => 'name', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'age', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'name', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => 'age', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -200,9 +200,9 @@ public function it_does_not_affect_ordering_when_reordering_columns()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => 'age', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'surname', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'name', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'age', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => 'surname', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => 'name', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -218,9 +218,9 @@ public function it_does_not_affect_global_searching_when_reordering_columns()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -243,7 +243,7 @@ public function it_does_not_affect_individual_searching_when_reordering_columns(
'orderable' => true,
'search' => ['value' => 'McCoy'],
],
['data' => 'age', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '19']],
['data' => 'age', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '19']],
[
'data' => 'name',
'name' => '',
Expand All @@ -266,9 +266,9 @@ public function it_does_custom_filtering_between()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -288,9 +288,9 @@ public function it_does_custom_filtering_where_in()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -311,9 +311,9 @@ public function it_does_return_null_when_there_is_no_custom_filter_return_value(
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '5']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '5']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->query('Select id as fid, name, surname, age from mytable');
Expand Down
54 changes: 27 additions & 27 deletions tests/unit/DatatablesTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ public function testFiltersDataViaGlobalSearch()
$this->request->query->set('search', ['value' => 'doe']);

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select name, surname from mytable');
Expand All @@ -151,9 +151,9 @@ public function testSortsDataViaSorting()
$this->request->query->set('order', [['column' => '1', 'dir' => 'desc']]); //surname-desc

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select name, surname, age from mytable');
Expand All @@ -168,8 +168,8 @@ public function testSortsExcludingHiddenColumns()
$this->request->query->set('order', [['column' => '1', 'dir' => 'asc']]); // age - asc

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -186,8 +186,8 @@ public function testSortsExcludingHiddenColumnsObjectData()
$this->request->query->set('order', [['column' => '1', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => 'name', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'age', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'name', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => 'age', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -205,9 +205,9 @@ public function testReorderingColumnsDoesNotAffectOrdering()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => 'age', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'surname', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'name', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => 'age', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => 'surname', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => 'name', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -223,9 +223,9 @@ public function testReorderingColumnsDoesNotAffectGlobalSearching()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -240,9 +240,9 @@ public function testReorderingColumnsDoesNotAffectIndividualSearching()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => 'surname', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => 'McCoy']],
['data' => 'age', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '19']],
['data' => 'name', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => 'Colin']],
['data' => 'surname', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => 'McCoy']],
['data' => 'age', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '19']],
['data' => 'name', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => 'Colin']],
]);

$this->db->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -258,9 +258,9 @@ public function testCustomFilteringBetween()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -280,9 +280,9 @@ public function testCustomFilteringWhereIn()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select id as fid, name, surname, age from mytable');
Expand All @@ -303,9 +303,9 @@ public function testReturnDefaultSearchWhenNull()
$this->request->query->set('order', [['column' => '0', 'dir' => 'asc']]);

$this->request->query->set('columns', [
['data' => '0', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '5']],
['data' => '1', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => true, 'orderable' => true, 'search' => ['value' => '']],
['data' => '0', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '5']],
['data' => '1', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
['data' => '2', 'name' => '', 'searchable' => 'true', 'orderable' => 'true', 'search' => ['value' => '']],
]);

$this->db->query('Select id as fid, name, surname, age from mytable');
Expand Down

0 comments on commit f443075

Please sign in to comment.