Improve tests

Nicolas Rodriguez · Nicolas Rodriguez · commit 1f621519c88d · 2017-07-06T23:32:52.000+02:00
diff --git a/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb b/spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb
@@ -43,55 +43,68 @@
       end
     end
 
-    context 'none of columns are connected' do
+    context 'when none of columns are connected' do
       before(:each) do
         allow(datatable).to receive(:searchable_columns) { [] }
       end
 
-      it 'returns empty query result' do
-        datatable.params[:search] = { value: 'msmith' }
-        expect(datatable.send(:build_conditions_for_datatable)).to be_blank
-      end
-    end
-
-    context 'with search query' do
       context 'when search value is a string' do
         before(:each) do
-          datatable.params[:search] = { value: 'john', regex: 'false' }
+          datatable.params[:search] = { value: 'msmith' }
         end
 
-        it 'returns a filtering query' do
+        it 'returns empty query result' do
+          expect(datatable.send(:build_conditions_for_datatable)).to be_blank
+        end
+
+        it 'returns filtered results' do
           query = datatable.send(:build_conditions_for_datatable)
           results = records.where(query).map(&:username)
-          expect(results).to include('johndoe')
-          expect(results).not_to include('msmith')
+          expect(results).to eq ['johndoe', 'msmith']
         end
       end
 
       context 'when search value is space-separated string' do
         before(:each) do
-          datatable.instance_variable_set :@searchable_columns, []
-          datatable.params[:search] = { value: 'foo bar', regex: 'false' }
+          datatable.params[:search] = { value: 'foo bar' }
         end
 
-        it 'returns a filtering query' do
+        it 'returns empty query result' do
+          expect(datatable.send(:build_conditions_for_datatable)).to be_blank
+        end
+
+        it 'returns filtered results' do
           query = datatable.send(:build_conditions_for_datatable)
           results = records.where(query).map(&:username)
           expect(results).to eq ['johndoe', 'msmith']
         end
       end
+    end
 
-      context 'when search value is comma-separated string' do
+    context 'with search query' do
+      context 'when search value is a string' do
         before(:each) do
-          datatable.instance_variable_set :@searchable_columns, []
-          datatable.params[:search] = { value: 'foo, bar', regex: 'false' }
-          expect(datatable).to receive(:global_search_delimiter).and_return(', ')
+          datatable.params[:search] = { value: 'john', regex: 'false' }
         end
 
         it 'returns a filtering query' do
           query = datatable.send(:build_conditions_for_datatable)
           results = records.where(query).map(&:username)
-          expect(results).to eq ['johndoe', 'msmith']
+          expect(results).to include('johndoe')
+          expect(results).not_to include('msmith')
+        end
+      end
+
+      context 'when search value is space-separated string' do
+        before(:each) do
+          datatable.params[:search] = { value: 'john doe', regex: 'false' }
+        end
+
+        it 'returns a filtering query' do
+          query = datatable.send(:build_conditions_for_datatable)
+          results = records.where(query).map(&:username)
+          expect(results).to eq ['johndoe']
+          expect(results).not_to include('msmith')
         end
       end
     end
