chewy 5.1.0 → 7.2.7

data/spec/chewy/rspec/helpers_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe :rspec_helper do
+  include ::Chewy::Rspec::Helpers
+
+  before do
+    stub_model(:city)
+    stub_index(:cities) { index_scope City }
+    CitiesIndex.create
+  end
+
+  let(:hits) do
+    [
+      {
+        '_index' => 'cities',
+        '_type' => '_doc',
+        '_id' => '1',
+        '_score' => 3.14,
+        '_source' => source
+      }
+    ]
+  end
+
+  let(:source) { {'name' => 'some_name'} }
+  let(:sources) { [source] }
+
+  context :mock_elasticsearch_response do
+    let(:raw_response) do
+      {
+        'took' => 4,
+        'timed_out' => false,
+        '_shards' => {
+          'total' => 1,
+          'successful' => 1,
+          'skipped' => 0,
+          'failed' => 0
+        },
+        'hits' => {
+          'total' => {
+            'value' => 1,
+            'relation' => 'eq'
+          },
+          'max_score' => 1.0,
+          'hits' => hits
+        }
+      }
+    end
+
+    specify do
+      mock_elasticsearch_response(CitiesIndex, raw_response)
+      expect(CitiesIndex.query({}).hits).to eq(hits)
+    end
+  end
+
+  context :mock_elasticsearch_response_sources do
+    specify do
+      mock_elasticsearch_response_sources(CitiesIndex, sources)
+      expect(CitiesIndex.query({}).hits).to eq(hits)
+    end
+  end
+end

data/spec/chewy/rspec/update_index_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe :update_index do
   before do
     stub_index(:dummies) do
-      define_type :dummy
-      define_type :dummy2
+    end
+    stub_index(:dummies2) do
     end
   end
 
@@ -13,27 +13,26 @@ describe :update_index do
     DummiesIndex.create!
   end
 
-  specify { expect {}.not_to update_index(DummiesIndex::Dummy) }
-  specify { expect { DummiesIndex::Dummy.bulk body: [] }.not_to update_index(DummiesIndex::Dummy) }
+  specify { expect {}.not_to update_index(DummiesIndex) }
+  specify { expect { DummiesIndex.bulk body: [] }.not_to update_index(DummiesIndex) }
 
   specify do
-    expect { expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42}}] }.not_to update_index(DummiesIndex::Dummy) }
+    expect { expect { DummiesIndex.bulk body: [{index: {_id: 42}}] }.not_to update_index(DummiesIndex) }
       .to fail_with(/Expected index .* not to be updated, but it was with/)
   end
 
   specify do
     expect do
-      DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}]
-      DummiesIndex::Dummy2.bulk body: [{index: {_id: 43, data: {}}}]
-    end.to update_index(DummiesIndex::Dummy).and_reindex(41, 42).only
+      DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}]
+    end.to update_index(DummiesIndex).and_reindex(41, 42).only
   end
 
   context do
     let(:expectation) do
       expect do
         expect do
-          DummiesIndex::Dummy.bulk body: [{index: {_id: 42}}, {index: {_id: 41}}, {index: {_id: 42}}]
-        end.not_to update_index(DummiesIndex::Dummy)
+          DummiesIndex.bulk body: [{index: {_id: 42}}, {index: {_id: 41}}, {index: {_id: 42}}]
+        end.not_to update_index(DummiesIndex)
       end
     end
 
@@ -44,119 +43,114 @@ describe :update_index do
   context 'compound matchers' do
     specify do
       expect do
-        DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}]
-        DummiesIndex::Dummy2.bulk body: [{index: {_id: 43, data: {}}}]
-      end.to update_index(DummiesIndex::Dummy).and_reindex(41, 42).only
-        .and update_index(DummiesIndex::Dummy2).and_reindex(43).only
+        DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}]
+        Dummies2Index.bulk body: [{index: {_id: 43, data: {}}}]
+      end.to update_index(DummiesIndex).and_reindex(41, 42).only
+        .and update_index(Dummies2Index).and_reindex(43).only
     end
 
     context do
       let(:expectation) do
         expect do
           expect do
-            DummiesIndex::Dummy2.bulk body: [{index: {_id: 43, data: {}}}]
-          end.to update_index(DummiesIndex::Dummy).and_reindex(41, 42).only
-            .and update_index(DummiesIndex::Dummy2).and_reindex(43).only
+            Dummies2Index.bulk body: [{index: {_id: 43, data: {}}}]
+          end.to update_index(DummiesIndex).and_reindex(41, 42).only
+            .and update_index(Dummies2Index).and_reindex(43).only
         end
       end
 
-      specify { expectation.to fail_matching 'Expected index `DummiesIndex::Dummy` to be updated' }
+      specify { expectation.to fail_matching 'Expected index `DummiesIndex` to be updated' }
     end
   end
 
   context '#only' do
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
-        .to update_index(DummiesIndex::Dummy).and_reindex(41, 42).only
+      expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
+        .to update_index(DummiesIndex).and_reindex(41, 42).only
     end
     specify do
       expect do
-        expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
-          .to update_index(DummiesIndex::Dummy).and_reindex(41).only
-      end
-        .to fail_matching 'to update documents ["41"] only, but ["42"] was updated also'
+        expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
+          .to update_index(DummiesIndex).and_reindex(41).only
+      end.to fail_matching 'to update documents ["41"] only, but ["42"] was updated also'
     end
     specify do
       expect do
-        expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
-          .to update_index(DummiesIndex::Dummy).and_reindex(41, times: 2).only
-      end
-        .to fail_matching 'to update documents ["41"] only, but ["42"] was updated also'
+        expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 41, data: {}}}] }
+          .to update_index(DummiesIndex).and_reindex(41, times: 2).only
+      end.to fail_matching 'to update documents ["41"] only, but ["42"] was updated also'
     end
 
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
-        .to update_index(DummiesIndex::Dummy).and_delete(41, 42).only
+      expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
+        .to update_index(DummiesIndex).and_delete(41, 42).only
     end
     specify do
       expect do
-        expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
-          .to update_index(DummiesIndex::Dummy).and_delete(41).only
-      end
-        .to fail_matching 'to delete documents ["41"] only, but ["42"] was deleted also'
+        expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
+          .to update_index(DummiesIndex).and_delete(41).only
+      end.to fail_matching 'to delete documents ["41"] only, but ["42"] was deleted also'
     end
     specify do
       expect do
-        expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
-          .to update_index(DummiesIndex::Dummy).and_delete(41, times: 2).only
-      end
-        .to fail_matching 'to delete documents ["41"] only, but ["42"] was deleted also'
+        expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 41}}] }
+          .to update_index(DummiesIndex).and_delete(41, times: 2).only
+      end.to fail_matching 'to delete documents ["41"] only, but ["42"] was deleted also'
     end
 
     specify do
       expect do
-        expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}] }
-          .to update_index(DummiesIndex::Dummy).and_reindex(42).only
-      end
-        .to fail_matching 'to update documents ["42"] only, but ["41"] was deleted also'
+        expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}] }
+          .to update_index(DummiesIndex).and_reindex(42).only
+      end.to fail_matching 'to update documents ["42"] only, but ["41"] was deleted also'
     end
     specify do
       expect do
-        expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}, {delete: {_id: 41}}] }
-          .to update_index(DummiesIndex::Dummy).and_reindex(42).only
-      end
-        .to fail_matching 'to update documents ["42"] only, but ["43"] was updated and ["41"] was deleted also'
+        expect do
+          DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}},
+                                   {delete: {_id: 41}}]
+        end.to update_index(DummiesIndex).and_reindex(42).only
+      end.to fail_matching 'to update documents ["42"] only, but ["43"] was updated and ["41"] was deleted also'
     end
     specify do
       expect do
-        expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}] }
-          .to update_index(DummiesIndex::Dummy).and_delete(41).only
-      end
-        .to fail_matching 'to delete documents ["41"] only, but ["42"] was updated also'
+        expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}] }
+          .to update_index(DummiesIndex).and_delete(41).only
+      end.to fail_matching 'to delete documents ["41"] only, but ["42"] was updated also'
     end
     specify do
       expect do
-        expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}, {delete: {_id: 43}}] }
-          .to update_index(DummiesIndex::Dummy).and_delete(41).only
-      end
-        .to fail_matching 'to delete documents ["41"] only, but ["42"] was updated and ["43"] was deleted also'
+        expect do
+          DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 41}}, {delete: {_id: 43}}]
+        end.to update_index(DummiesIndex).and_delete(41).only
+      end.to fail_matching 'to delete documents ["41"] only, but ["42"] was updated and ["43"] was deleted also'
     end
   end
 
   context '#and_reindex' do
-    specify { expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42}}] }.to update_index(DummiesIndex::Dummy) }
+    specify { expect { DummiesIndex.bulk body: [{index: {_id: 42}}] }.to update_index(DummiesIndex) }
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}] }
-        .to update_index(DummiesIndex::Dummy).and_reindex(42)
+      expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}] }
+        .to update_index(DummiesIndex).and_reindex(42)
     end
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
-        .to update_index(DummiesIndex::Dummy).and_reindex(double(id: 42))
+      expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
+        .to update_index(DummiesIndex).and_reindex(double(id: 42))
     end
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
-        .to update_index(DummiesIndex::Dummy).and_reindex(double(id: 42), double(id: 43))
+      expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
+        .to update_index(DummiesIndex).and_reindex(double(id: 42), double(id: 43))
     end
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
-        .to update_index(DummiesIndex::Dummy).and_reindex([double(id: 42), 43])
+      expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}] }
+        .to update_index(DummiesIndex).and_reindex([double(id: 42), 43])
     end
 
     specify do
       expect do
         expect do
-          DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
-        end.to update_index(DummiesIndex::Dummy).and_reindex([44, 43])
+          DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
+        end.to update_index(DummiesIndex).and_reindex([44, 43])
       end.to fail_matching 'Expected document with id `44` to be reindexed, but it was not'
     end
 
@@ -164,8 +158,9 @@ describe :update_index do
       let(:expectation) do
         expect do
           expect do
-            DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
-          end.to update_index(DummiesIndex::Dummy).and_reindex(44, double(id: 47)) end
+            DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
+          end.to update_index(DummiesIndex).and_reindex(44, double(id: 47))
+        end
       end
 
       specify { expectation.to fail_matching('Expected document with id `44` to be reindexed, but it was not') }
@@ -175,24 +170,27 @@ describe :update_index do
     context ':times' do
       specify do
         expect do
-          DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
-          DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {}}}, {index: {_id: 44, data: {}}}]
-        end.to update_index(DummiesIndex::Dummy).and_reindex(42, 44, times: 1).and_reindex(43, times: 2) end
+          DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
+          DummiesIndex.bulk body: [{index: {_id: 43, data: {}}}, {index: {_id: 44, data: {}}}]
+        end.to update_index(DummiesIndex).and_reindex(42, 44, times: 1).and_reindex(43, times: 2)
+      end
 
       specify do
         expect do
           expect do
-            DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {a: '1'}}}]
-          end.to update_index(DummiesIndex::Dummy).and_reindex(42, times: 3)
-        end.to fail_matching('Expected document with id `42` to be reindexed, but it was not') end
+            DummiesIndex.bulk body: [{index: {_id: 43, data: {a: '1'}}}]
+          end.to update_index(DummiesIndex).and_reindex(42, times: 3)
+        end.to fail_matching('Expected document with id `42` to be reindexed, but it was not')
+      end
 
       context do
         let(:expectation) do
           expect do
             expect do
-              DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
-              DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {}}}, {index: {_id: 44, data: {}}}]
-            end.to update_index(DummiesIndex::Dummy).and_reindex(42, times: 3).and_reindex(44, 43, times: 4) end
+              DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {index: {_id: 43, data: {}}}]
+              DummiesIndex.bulk body: [{index: {_id: 43, data: {}}}, {index: {_id: 44, data: {}}}]
+            end.to update_index(DummiesIndex).and_reindex(42, times: 3).and_reindex(44, 43, times: 4)
+          end
         end
 
         specify { expectation.to fail_matching 'Expected document with id `44` to be reindexed' }
@@ -205,20 +203,23 @@ describe :update_index do
     context ':with' do
       specify do
         expect do
-          DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {a: '1'}}}, {index: {_id: 42, data: {'a' => 2}}}]
-        end.to update_index(DummiesIndex::Dummy).and_reindex(42, with: {a: 2}) end
+          DummiesIndex.bulk body: [{index: {_id: 42, data: {a: '1'}}}, {index: {_id: 42, data: {'a' => 2}}}]
+        end.to update_index(DummiesIndex).and_reindex(42, with: {a: 2})
+      end
 
       specify do
         expect do
-          DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {a: '1'}}}, {index: {_id: 42, data: {'b' => 2}}}]
-        end.to update_index(DummiesIndex::Dummy).and_reindex(42, with: {a: '1', b: 2}) end
+          DummiesIndex.bulk body: [{index: {_id: 42, data: {a: '1'}}}, {index: {_id: 42, data: {'b' => 2}}}]
+        end.to update_index(DummiesIndex).and_reindex(42, with: {a: '1', b: 2})
+      end
 
       specify do
         expect do
           expect do
-            DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {a: '1'}}}]
-          end.to update_index(DummiesIndex::Dummy).and_reindex(42, with: {a: 1})
-        end.to fail_matching('Expected document with id `42` to be reindexed, but it was not') end
+            DummiesIndex.bulk body: [{index: {_id: 43, data: {a: '1'}}}]
+          end.to update_index(DummiesIndex).and_reindex(42, with: {a: 1})
+        end.to fail_matching('Expected document with id `42` to be reindexed, but it was not')
+      end
 
       [
         [{a: %w[one two]}, {a: %w[one two]}],
@@ -229,8 +230,9 @@ describe :update_index do
       ].each do |(data, with)|
         specify do
           expect do
-            DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: data}}]
-          end.to update_index(DummiesIndex::Dummy).and_reindex(42, with: with) end
+            DummiesIndex.bulk body: [{index: {_id: 42, data: data}}]
+          end.to update_index(DummiesIndex).and_reindex(42, with: with)
+        end
       end
 
       [
@@ -243,17 +245,19 @@ describe :update_index do
         specify do
           expect do
             expect do
-              DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: data}}]
-            end.to update_index(DummiesIndex::Dummy).and_reindex(42, with: with)
-          end.to fail_matching('Expected document with id `42` to be reindexed') end
+              DummiesIndex.bulk body: [{index: {_id: 42, data: data}}]
+            end.to update_index(DummiesIndex).and_reindex(42, with: with)
+          end.to fail_matching('Expected document with id `42` to be reindexed')
+        end
       end
 
       context do
         let(:expectation) do
           expect do
             expect do
-              DummiesIndex::Dummy.bulk body: [{index: {_id: 43, data: {a: '1'}}}, {index: {_id: 42, data: {'a' => 2}}}]
-            end.to update_index(DummiesIndex::Dummy).and_reindex(43, times: 2, with: {a: 2}) end
+              DummiesIndex.bulk body: [{index: {_id: 43, data: {a: '1'}}}, {index: {_id: 42, data: {'a' => 2}}}]
+            end.to update_index(DummiesIndex).and_reindex(43, times: 2, with: {a: 2})
+          end
         end
 
         specify { expectation.to fail_matching 'Expected document with id `43` to be reindexed' }
@@ -265,27 +269,27 @@ describe :update_index do
 
   context '#and_delete' do
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 43}}] }
-        .to update_index(DummiesIndex::Dummy).and_reindex(42).and_delete(double(id: 43))
+      expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 43}}] }
+        .to update_index(DummiesIndex).and_reindex(42).and_delete(double(id: 43))
     end
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
-        .to update_index(DummiesIndex::Dummy).and_delete(42).and_delete(double(id: 43))
+      expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
+        .to update_index(DummiesIndex).and_delete(42).and_delete(double(id: 43))
     end
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
-        .to update_index(DummiesIndex::Dummy).and_delete(42, double(id: 43))
+      expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
+        .to update_index(DummiesIndex).and_delete(42, double(id: 43))
     end
     specify do
-      expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
-        .to update_index(DummiesIndex::Dummy).and_delete([43, double(id: 42)])
+      expect { DummiesIndex.bulk body: [{delete: {_id: 42}}, {delete: {_id: 43}}] }
+        .to update_index(DummiesIndex).and_delete([43, double(id: 42)])
     end
 
     context do
       let(:expectation) do
         expect do
-          expect { DummiesIndex::Dummy.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 43}}] }
-            .to update_index(DummiesIndex::Dummy).and_reindex(43).and_delete(double(id: 42))
+          expect { DummiesIndex.bulk body: [{index: {_id: 42, data: {}}}, {delete: {_id: 43}}] }
+            .to update_index(DummiesIndex).and_reindex(43).and_delete(double(id: 42))
         end
       end
 
@@ -296,8 +300,8 @@ describe :update_index do
     context do
       let(:expectation) do
         expect do
-          expect { DummiesIndex::Dummy.bulk body: [{delete: {_id: 42, data: {}}}, {delete: {_id: 42}}] }
-            .to update_index(DummiesIndex::Dummy).and_delete(44, times: 2).and_delete(double(id: 42), times: 3)
+          expect { DummiesIndex.bulk body: [{delete: {_id: 42, data: {}}}, {delete: {_id: 42}}] }
+            .to update_index(DummiesIndex).and_delete(44, times: 2).and_delete(double(id: 42), times: 3)
         end
       end
 

data/spec/chewy/runtime_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Chewy::Runtime do
   describe '.version' do
     specify { expect(described_class.version).to be_a(described_class::Version) }
-    specify { expect(described_class.version).to be >= '2.4' }
-    specify { expect(described_class.version).to be < '6.0' }
+    specify { expect(described_class.version).to be >= '7.0' }
+    specify { expect(described_class.version).to be < '8.0' }
   end
 end

data/spec/chewy/search/loader_spec.rb

@@ -8,17 +8,15 @@ describe Chewy::Search::Loader do
     stub_model(:country)
 
     stub_index(:cities) do
-      define_type City do
-        field :name
-        field :rating, type: 'integer'
-      end
+      index_scope City
+      field :name
+      field :rating, type: 'integer'
     end
 
     stub_index(:countries) do
-      define_type Country do
-        field :name
-        field :rating, type: 'integer'
-      end
+      index_scope Country
+      field :name
+      field :rating, type: 'integer'
     end
   end
 
@@ -33,19 +31,18 @@ describe Chewy::Search::Loader do
   let(:options) { {} }
   subject { described_class.new(indexes: [CitiesIndex, CountriesIndex], **options) }
 
-  describe '#derive_type' do
-    specify { expect(subject.derive_type('cities', 'city')).to eq(CitiesIndex::City) }
-    specify { expect(subject.derive_type('cities_suffix', 'city')).to eq(CitiesIndex::City) }
+  describe '#derive_index' do
+    specify { expect(subject.derive_index('cities')).to eq(CitiesIndex) }
+    specify { expect(subject.derive_index('cities_suffix')).to eq(CitiesIndex) }
 
-    specify { expect { subject.derive_type('cities', 'place') }.to raise_error(Chewy::UnderivableType) }
-    specify { expect { subject.derive_type('whatever', 'city') }.to raise_error(Chewy::UnderivableType) }
-    specify { expect { subject.derive_type('citiessuffix', 'city') }.to raise_error(Chewy::UnderivableType) }
+    specify { expect { subject.derive_index('whatever') }.to raise_error(Chewy::UndefinedIndex) }
+    specify { expect { subject.derive_index('citiessuffix') }.to raise_error(Chewy::UndefinedIndex) }
 
     context do
       before { CitiesIndex.index_name :boro_goves }
 
-      specify { expect(subject.derive_type('boro_goves', 'city')).to eq(CitiesIndex::City) }
-      specify { expect(subject.derive_type('boro_goves_suffix', 'city')).to eq(CitiesIndex::City) }
+      specify { expect(subject.derive_index('boro_goves')).to eq(CitiesIndex) }
+      specify { expect(subject.derive_index('boro_goves_suffix')).to eq(CitiesIndex) }
     end
   end
 
@@ -54,21 +51,6 @@ describe Chewy::Search::Loader do
 
     specify { expect(subject.load(hits)).to eq([*cities, *countries]) }
 
-    context do
-      let(:options) { {only: 'city'} }
-      specify { expect(subject.load(hits)).to eq([*cities, nil, nil]) }
-    end
-
-    context do
-      let(:options) { {except: 'city'} }
-      specify { expect(subject.load(hits)).to eq([nil, nil, *countries]) }
-    end
-
-    context do
-      let(:options) { {except: %w[city country]} }
-      specify { expect(subject.load(hits)).to eq([nil, nil, nil, nil]) }
-    end
-
     context 'scopes', :active_record do
       context do
         let(:options) { {scope: -> { where('rating > 2') }} }
@@ -76,19 +58,7 @@ describe Chewy::Search::Loader do
       end
 
       context do
-        let(:options) { {country: {scope: -> { where('rating > 2') }}} }
-        specify { expect(subject.load(hits)).to eq([*cities, nil, countries.last]) }
-      end
-    end
-
-    context 'scopes', :mongoid do
-      context do
-        let(:options) { {scope: -> { where(:rating.gt => 2) }} }
-        specify { expect(subject.load(hits)).to eq([nil, nil, nil, countries.last]) }
-      end
-
-      context do
-        let(:options) { {country: {scope: -> { where(:rating.gt => 2) }}} }
+        let(:options) { {countries: {scope: -> { where('rating > 2') }}} }
         specify { expect(subject.load(hits)).to eq([*cities, nil, countries.last]) }
       end
     end
@@ -96,21 +66,17 @@ describe Chewy::Search::Loader do
     context 'objects' do
       before do
         stub_index(:cities) do
-          define_type :city do
-            field :name
-            field :rating, type: 'integer'
-          end
+          field :name
+          field :rating, type: 'integer'
         end
 
         stub_index(:countries) do
-          define_type :country do
-            field :name
-            field :rating, type: 'integer'
-          end
+          field :name
+          field :rating, type: 'integer'
         end
       end
 
-      specify { expect(subject.load(hits).map(&:class).uniq).to eq([CitiesIndex::City, CountriesIndex::Country]) }
+      specify { expect(subject.load(hits).map(&:class).uniq).to eq([CitiesIndex, CountriesIndex]) }
       specify { expect(subject.load(hits).map(&:rating)).to eq([*cities, *countries].map(&:rating)) }
     end
   end

data/spec/chewy/search/pagination/kaminari_examples.rb

@@ -5,10 +5,8 @@ shared_examples :kaminari do |request_base_class|
 
   before do
     stub_index(:products) do
-      define_type(:product) do
-        field :name
-        field :age, type: 'integer'
-      end
+      field :name
+      field :age, type: 'integer'
     end
   end
 
@@ -25,7 +23,7 @@ shared_examples :kaminari do |request_base_class|
   context do
     let(:data) { Array.new(10) { |i| {id: i.next.to_s, name: "Name#{i.next}", age: 10 * i.next}.stringify_keys! } }
 
-    before { ProductsIndex::Product.import!(data.map { |h| double(h) }) }
+    before { ProductsIndex.import!(data.map { |h| double(h) }) }
     before { allow(::Kaminari.config).to receive_messages(default_per_page: 3) }
 
     describe '#per, #page' do

data/spec/chewy/search/pagination/kaminari_spec.rb

@@ -5,7 +5,7 @@ describe Chewy::Search::Pagination::Kaminari do
     describe '#objects' do
       let(:data) { Array.new(12) { |i| {id: i.next.to_s, name: "Name#{i.next}", age: 10 * i.next}.stringify_keys! } }
 
-      before { ProductsIndex::Product.import!(data.map { |h| double(h) }) }
+      before { ProductsIndex.import!(data.map { |h| double(h) }) }
       before { allow(::Kaminari.config).to receive_messages(default_per_page: 17) }
 
       specify { expect(search.objects.class).to eq(Kaminari::PaginatableArray) }

data/spec/chewy/search/parameters/collapse_spec.rb

@@ -0,0 +1,5 @@
+require 'chewy/search/parameters/hash_storage_examples'
+
+describe Chewy::Search::Parameters::Collapse do
+  it_behaves_like :hash_storage, :collapse
+end