Add test data for custom_field feature

spec/ajax-datatables-rails/datatable/datatable_spec.rb

@@ -40,8 +40,8 @@
   end
 
   shared_examples 'columns methods' do
-    it 'has 4 columns' do
-      expect(datatable.columns.count).to eq(6)
+    it 'has 7 columns' do
+      expect(datatable.columns.count).to eq(7)
     end
 
     it 'child class' do

spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb

@@ -236,7 +236,7 @@
 
         context 'when range is empty' do
           it 'does not filter records' do
-            datatable.params[:columns]['5'][:search][:value] = '-'
+            datatable.params[:columns]['6'][:search][:value] = '-'
             expect(datatable.data.size).to eq 2
             item = datatable.data.first
             expect(item[:last_name]).to eq 'Doe'
@@ -245,21 +245,21 @@
 
         context 'when start date is filled' do
           it 'filters records created after this date' do
-            datatable.params[:columns]['5'][:search][:value] = '31/12/1999-'
+            datatable.params[:columns]['6'][:search][:value] = '31/12/1999-'
             expect(datatable.data.size).to eq 2
           end
         end
 
         context 'when end date is filled' do
           it 'filters records created before this date' do
-            datatable.params[:columns]['5'][:search][:value] = '-31/12/1999'
+            datatable.params[:columns]['6'][:search][:value] = '-31/12/1999'
             expect(datatable.data.size).to eq 0
           end
         end
 
         context 'when both date are filled' do
           it 'filters records created between the range' do
-            datatable.params[:columns]['5'][:search][:value] = '01/12/1999-15/01/2000'
+            datatable.params[:columns]['6'][:search][:value] = '01/12/1999-15/01/2000'
             expect(datatable.data.size).to eq 1
           end
         end
@@ -268,7 +268,7 @@
           context 'when range is empty' do
             it 'filters records' do
               datatable.params[:columns]['0'][:search][:value] = 'doe'
-              datatable.params[:columns]['5'][:search][:value] = '-'
+              datatable.params[:columns]['6'][:search][:value] = '-'
               expect(datatable.data.size).to eq 1
               item = datatable.data.first
               expect(item[:last_name]).to eq 'Doe'
@@ -278,7 +278,7 @@
           context 'when start date is filled' do
             it 'filters records' do
               datatable.params[:columns]['0'][:search][:value] = 'doe'
-              datatable.params[:columns]['5'][:search][:value] = '01/12/1999-'
+              datatable.params[:columns]['6'][:search][:value] = '01/12/1999-'
               expect(datatable.data.size).to eq 1
               item = datatable.data.first
               expect(item[:last_name]).to eq 'Doe'
@@ -288,7 +288,7 @@
           context 'when end date is filled' do
             it 'filters records' do
               datatable.params[:columns]['0'][:search][:value] = 'doe'
-              datatable.params[:columns]['5'][:search][:value] = '-15/01/2000'
+              datatable.params[:columns]['6'][:search][:value] = '-15/01/2000'
               expect(datatable.data.size).to eq 1
               item = datatable.data.first
               expect(item[:last_name]).to eq 'Doe'
@@ -298,7 +298,7 @@
           context 'when both date are filled' do
             it 'filters records' do
               datatable.params[:columns]['0'][:search][:value] = 'doe'
-              datatable.params[:columns]['5'][:search][:value] = '01/12/1999-15/01/2000'
+              datatable.params[:columns]['6'][:search][:value] = '01/12/1999-15/01/2000'
               expect(datatable.data.size).to eq 1
               item = datatable.data.first
               expect(item[:last_name]).to eq 'Doe'
@@ -318,7 +318,7 @@
         let(:datatable) { DatatableCondEq.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 1
+          datatable.params[:columns]['5'][:search][:value] = 1
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'john'
@@ -329,7 +329,7 @@
         let(:datatable) { DatatableCondNotEq.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 1
+          datatable.params[:columns]['5'][:search][:value] = 1
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'mary'
@@ -340,7 +340,7 @@
         let(:datatable) { DatatableCondLt.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 2
+          datatable.params[:columns]['5'][:search][:value] = 2
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'john'
@@ -351,7 +351,7 @@
         let(:datatable) { DatatableCondGt.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 1
+          datatable.params[:columns]['5'][:search][:value] = 1
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'mary'
@@ -362,7 +362,7 @@
         let(:datatable) { DatatableCondLteq.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 2
+          datatable.params[:columns]['5'][:search][:value] = 2
           expect(datatable.data.size).to eq 2
         end
       end
@@ -371,7 +371,7 @@
         let(:datatable) { DatatableCondGteq.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = 1
+          datatable.params[:columns]['5'][:search][:value] = 1
           expect(datatable.data.size).to eq 2
         end
       end
@@ -380,7 +380,7 @@
         let(:datatable) { DatatableCondIn.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = [1]
+          datatable.params[:columns]['5'][:search][:value] = [1]
           expect(datatable.data.size).to eq 1
           item = datatable.data.first
           expect(item[:first_name]).to eq 'john'
@@ -391,8 +391,8 @@
         let(:datatable) { DatatableCondInWithRegex.new(sample_params) }
 
         it 'filters records matching' do
-          datatable.params[:columns]['4'][:search][:value] = '1|2'
-          datatable.params[:order]['0'] = { column: '4', dir: 'asc' }
+          datatable.params[:columns]['5'][:search][:value] = '1|2'
+          datatable.params[:order]['0'] = { column: '5', dir: 'asc' }
           expect(datatable.data.size).to eq 2
           item = datatable.data.first
           expect(item[:first_name]).to eq 'john'
@@ -411,17 +411,17 @@
         end
 
         it 'Returns an empty result if input value is too large' do
-          datatable.params[:columns]['4'][:search][:value] = largest_postgresql_integer_value + 1
+          datatable.params[:columns]['5'][:search][:value] = largest_postgresql_integer_value + 1
           expect(datatable.data.size).to eq 0
         end
 
         it 'Returns an empty result if input value is too small' do
-          datatable.params[:columns]['4'][:search][:value] = smallest_postgresql_integer_value - 1
+          datatable.params[:columns]['5'][:search][:value] = smallest_postgresql_integer_value - 1
           expect(datatable.data.size).to eq 0
         end
 
         it 'returns the matching user' do
-          datatable.params[:columns]['4'][:search][:value] = largest_postgresql_integer_value
+          datatable.params[:columns]['5'][:search][:value] = largest_postgresql_integer_value
           expect(datatable.data.size).to eq 1
         end
       end

spec/support/datatables/complex_datatable.rb

@@ -7,6 +7,7 @@ def view_columns
       email:      { source: 'User.email'      },
       first_name: { source: 'User.first_name' },
       last_name:  { source: 'User.last_name'  },
+      full_name:  { source: 'full_name' },
       post_id:    { source: 'User.post_id', orderable: false },
       created_at: { source: 'User.created_at' },
     }
@@ -19,6 +20,7 @@ def data
         email:      record.email,
         first_name: record.first_name,
         last_name:  record.last_name,
+        full_name:  record.full_name,
         post_id:    record.post_id,
         created_at: record.created_at,
       }

spec/support/helpers/params.rb

@@ -31,12 +31,18 @@ def sample_params
           }
         },
         '4' => {
-          'data' => 'post_id', 'name' => '', 'searchable' => 'true', 'orderable' => 'true',
+          'data' => 'full_name', 'name' => '', 'searchable' => 'true', 'orderable' => 'true',
           'search' => {
             'value' => '', 'regex' => 'false'
           }
         },
         '5' => {
+          'data' => 'post_id', 'name' => '', 'searchable' => 'true', 'orderable' => 'true',
+          'search' => {
+            'value' => '', 'regex' => 'false'
+          }
+        },
+        '6' => {
           'data' => 'created_at', 'name' => '', 'searchable' => 'true', 'orderable' => 'true',
           'search' => {
             'value' => '', 'regex' => 'false'

spec/support/models/user.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 class User < ActiveRecord::Base
+  def full_name
+    "#{first_name} #{last_name}"
+  end
 end