chewy 5.1.0 → 7.2.7

data/spec/chewy/search/request_spec.rb

@@ -5,21 +5,17 @@ describe Chewy::Search::Request do
 
   before do
     stub_index(:products) do
-      define_type :product do
-        field :id, type: :integer
-        field :name
-        field :age, type: :integer
-      end
-      define_type :city do
-        field :id, type: :integer
-      end
-      define_type :country do
-        field :id, type: :integer
-      end
+      field :id, type: :integer
+      field :name
+      field :age, type: :integer
     end
 
     stub_index(:cities) do
-      define_type :city
+      field :id, type: :integer
+    end
+
+    stub_index(:countries) do
+      field :id, type: :integer
     end
   end
 
@@ -29,15 +25,17 @@ describe Chewy::Search::Request do
     specify { expect(described_class.new(ProductsIndex)).to eq(described_class.new(ProductsIndex)) }
     specify { expect(described_class.new(ProductsIndex)).not_to eq(described_class.new(CitiesIndex)) }
     specify { expect(described_class.new(ProductsIndex)).not_to eq(described_class.new(ProductsIndex, CitiesIndex)) }
-    specify { expect(described_class.new(CitiesIndex, ProductsIndex)).to eq(described_class.new(ProductsIndex, CitiesIndex)) }
-    specify { expect(described_class.new(ProductsIndex::Product)).to eq(described_class.new(ProductsIndex::Product)) }
-    specify { expect(described_class.new(ProductsIndex::Product)).not_to eq(described_class.new(ProductsIndex::City)) }
-    specify { expect(described_class.new(ProductsIndex::Product)).not_to eq(described_class.new(ProductsIndex::Product, ProductsIndex::City)) }
-    specify { expect(described_class.new(ProductsIndex::City, ProductsIndex::Product)).to eq(described_class.new(ProductsIndex::Product, ProductsIndex::City)) }
-    specify { expect(described_class.new(ProductsIndex::City, CitiesIndex::City)).to eq(described_class.new(CitiesIndex::City, ProductsIndex::City)) }
+    specify do
+      expect(described_class.new(CitiesIndex, ProductsIndex)).to eq(described_class.new(ProductsIndex, CitiesIndex))
+    end
+    specify do
+      expect(described_class.new(ProductsIndex, CitiesIndex)).to eq(described_class.new(CitiesIndex, ProductsIndex))
+    end
 
     specify { expect(described_class.new(ProductsIndex).limit(10)).to eq(described_class.new(ProductsIndex).limit(10)) }
-    specify { expect(described_class.new(ProductsIndex).limit(10)).not_to eq(described_class.new(ProductsIndex).limit(20)) }
+    specify do
+      expect(described_class.new(ProductsIndex).limit(10)).not_to eq(described_class.new(ProductsIndex).limit(20))
+    end
 
     specify { expect(ProductsIndex.limit(10)).to eq(ProductsIndex.limit(10)) }
     specify { expect(ProductsIndex.limit(10)).not_to eq(CitiesIndex.limit(10)) }
@@ -48,7 +46,6 @@ describe Chewy::Search::Request do
       expect(subject.render)
         .to match(
           index: %w[products],
-          type: array_including(%w[product city country]),
           body: {}
         )
     end
@@ -57,60 +54,113 @@ describe Chewy::Search::Request do
   describe '#inspect' do
     specify do
       expect(described_class.new(ProductsIndex).inspect)
-        .to eq('<Chewy::Search::Request {:index=>["products"], :type=>["city", "country", "product"], :body=>{}}>')
+        .to eq('<Chewy::Search::Request {:index=>["products"], :body=>{}}>')
     end
     specify do
       expect(ProductsIndex.limit(10).inspect)
-        .to eq('<ProductsIndex::Query {:index=>["products"], :type=>["city", "country", "product"], :body=>{:size=>10}}>')
+        .to eq('<ProductsIndex::Query {:index=>["products"], :body=>{:size=>10}}>')
     end
   end
 
   %i[query post_filter].each do |name|
     describe "##{name}" do
-      specify { expect(subject.send(name, match: {foo: 'bar'}).render[:body]).to include(name => {match: {foo: 'bar'}}) }
+      specify do
+        expect(subject.send(name, match: {foo: 'bar'}).render[:body])
+          .to include(name => {match: {foo: 'bar'}})
+      end
       specify { expect(subject.send(name, nil)).to be_a described_class }
-      specify { expect(subject.send(name) { match foo: 'bar' }.render[:body]).to include(name => {match: {foo: 'bar'}}) }
+      specify do
+        expect(subject.send(name) { match foo: 'bar' }.render[:body])
+          .to include(name => {match: {foo: 'bar'}})
+      end
       specify do
         expect(subject.send(name, match: {foo: 'bar'}).send(name) { multi_match foo: 'bar' }.render[:body])
           .to include(name => {bool: {must: [{match: {foo: 'bar'}}, {multi_match: {foo: 'bar'}}]}})
       end
       specify { expect { subject.send(name, match: {foo: 'bar'}) }.not_to change { subject.render } }
       specify do
-        expect(subject.send(name).should(match: {foo: 'bar'}).send(name).must_not { multi_match foo: 'bar' }.render[:body])
-          .to include(name => {bool: {should: {match: {foo: 'bar'}}, must_not: {multi_match: {foo: 'bar'}}}})
+        expect(
+          subject.send(name).should(match: {foo: 'bar'}).send(name).must_not { multi_match foo: 'bar' }.render[:body]
+        ).to include(name => {bool: {should: {match: {foo: 'bar'}}, must_not: {multi_match: {foo: 'bar'}}}})
       end
 
       context do
         let(:other_scope) { subject.send(name).should { multi_match foo: 'bar' }.send(name) { match foo: 'bar' } }
 
         specify do
-          expect(subject.send(name).not(other_scope).render[:body])
-            .to include(name => {bool: {must_not: {bool: {must: {match: {foo: 'bar'}}, should: {multi_match: {foo: 'bar'}}}}}})
+          expect(
+            subject.send(name).not(other_scope).render[:body]
+          ).to include(
+            name => {
+              bool: {
+                must_not: {
+                  bool: {
+                    must: {match: {foo: 'bar'}},
+                    should: {multi_match: {foo: 'bar'}}
+                  }
+                }
+              }
+            }
+          )
         end
       end
     end
   end
 
   describe '#filter' do
-    specify { expect(subject.filter(match: {foo: 'bar'}).render[:body]).to include(query: {bool: {filter: {match: {foo: 'bar'}}}}) }
+    specify do
+      expect(subject.filter(match: {foo: 'bar'}).render[:body])
+        .to include(query: {bool: {filter: {match: {foo: 'bar'}}}})
+    end
     specify { expect(subject.filter(nil)).to be_a described_class }
-    specify { expect(subject.filter { match foo: 'bar' }.render[:body]).to include(query: {bool: {filter: {match: {foo: 'bar'}}}}) }
+    specify do
+      expect(subject.filter(match: {foo: 'bar'}).render[:body])
+        .to include(query: {bool: {filter: {match: {foo: 'bar'}}}})
+    end
     specify do
       expect(subject.filter(match: {foo: 'bar'}).filter { multi_match foo: 'bar' }.render[:body])
         .to include(query: {bool: {filter: [{match: {foo: 'bar'}}, {multi_match: {foo: 'bar'}}]}})
     end
     specify { expect { subject.filter(match: {foo: 'bar'}) }.not_to change { subject.render } }
     specify do
-      expect(subject.filter.should(match: {foo: 'bar'}).filter.must_not { multi_match foo: 'bar' }.render[:body])
-        .to include(query: {bool: {filter: {bool: {should: {match: {foo: 'bar'}}, must_not: {multi_match: {foo: 'bar'}}}}}})
+      expect(
+        subject.filter.should(match: {foo: 'bar'}).filter.must_not { multi_match foo: 'bar' }.render[:body]
+      ).to include(
+        query: {
+          bool: {
+            filter: {
+              bool: {
+                should: {match: {foo: 'bar'}},
+                must_not: {multi_match: {foo: 'bar'}}
+              }
+            }
+          }
+        }
+      )
     end
 
     context do
       let(:other_scope) { subject.filter.should { multi_match foo: 'bar' }.filter { match foo: 'bar' } }
 
       specify do
-        expect(subject.filter.not(other_scope).render[:body])
-          .to include(query: {bool: {filter: {bool: {must_not: {bool: {must: {match: {foo: 'bar'}}, should: {multi_match: {foo: 'bar'}}}}}}}})
+        expect(
+          subject.filter.not(other_scope).render[:body]
+        ).to include(
+          query: {
+            bool: {
+              filter: {
+                bool: {
+                  must_not: {
+                    bool: {
+                      must: {match: {foo: 'bar'}},
+                      should: {multi_match: {foo: 'bar'}}
+                    }
+                  }
+                }
+              }
+            }
+          }
+        )
       end
     end
   end
@@ -127,7 +177,7 @@ describe Chewy::Search::Request do
   describe '#order' do
     specify { expect(subject.order(:foo).render[:body]).to include(sort: ['foo']) }
     specify { expect(subject.order(foo: 42).order(nil).render[:body]).to include(sort: ['foo' => 42]) }
-    specify { expect(subject.order(foo: 42).order(foo: 43).render[:body]).to include(sort: ['foo' => 43]) }
+    specify { expect(subject.order(foo: 42).order(foo: 43).render[:body]).to include(sort: [{'foo' => 42}, {'foo' => 43}]) }
     specify { expect(subject.order(:foo).order(:bar, :baz).render[:body]).to include(sort: %w[foo bar baz]) }
     specify { expect(subject.order(nil).render[:body]).to be_blank }
     specify { expect { subject.order(:foo) }.not_to change { subject.render } }
@@ -142,7 +192,7 @@ describe Chewy::Search::Request do
     specify { expect { subject.reorder(:foo) }.not_to change { subject.render } }
   end
 
-  %i[track_scores explain version profile].each do |name|
+  %i[track_scores track_total_hits explain version profile].each do |name|
     describe "##{name}" do
       specify { expect(subject.send(name).render[:body]).to include(name => true) }
       specify { expect(subject.send(name).send(name, false).render[:body]).to be_blank }
@@ -164,13 +214,18 @@ describe Chewy::Search::Request do
     specify { expect { subject.search_type('foo') }.not_to change { subject.render } }
   end
 
-  %i[preference timeout].each do |name|
-    describe "##{name}" do
-      specify { expect(subject.send(name, :foo).render[:body]).to include(name => 'foo') }
-      specify { expect(subject.send(name, :foo).send(name, :bar).render[:body]).to include(name => 'bar') }
-      specify { expect(subject.send(name, :foo).send(name, nil).render[:body]).to be_blank }
-      specify { expect { subject.send(name, :foo) }.not_to change { subject.render } }
-    end
+  describe '#preference' do
+    specify { expect(subject.preference('foo').render).to include(preference: 'foo') }
+    specify { expect(subject.preference('foo').preference('bar').render).to include(preference: 'bar') }
+    specify { expect(subject.preference('foo').preference(nil).render[:preference]).to be_blank }
+    specify { expect { subject.preference('foo') }.not_to change { subject.render } }
+  end
+
+  describe '#timeout' do
+    specify { expect(subject.timeout(:foo).render[:body]).to include(timeout: 'foo') }
+    specify { expect(subject.timeout(:foo).timeout(:bar).render[:body]).to include(timeout: 'bar') }
+    specify { expect(subject.timeout(:foo).timeout(nil).render[:body]).to be_blank }
+    specify { expect { subject.timeout(:foo) }.not_to change { subject.render } }
   end
 
   describe '#source' do
@@ -178,23 +233,53 @@ describe Chewy::Search::Request do
     specify { expect(subject.source(:foo, :bar).source(nil).render[:body]).to include(_source: %w[foo bar]) }
     specify { expect(subject.source(%i[foo bar]).source(nil).render[:body]).to include(_source: %w[foo bar]) }
     specify { expect(subject.source(excludes: :foo).render[:body]).to include(_source: {excludes: %w[foo]}) }
-    specify { expect(subject.source(excludes: :foo).source(excludes: %i[foo bar]).render[:body]).to include(_source: {excludes: %w[foo bar]}) }
-    specify { expect(subject.source(excludes: :foo).source(excludes: %i[foo bar]).render[:body]).to include(_source: {excludes: %w[foo bar]}) }
-    specify { expect(subject.source(excludes: :foo).source(:bar).render[:body]).to include(_source: {includes: %w[bar], excludes: %w[foo]}) }
+    specify do
+      expect(subject.source(excludes: :foo).source(excludes: %i[foo bar]).render[:body])
+        .to include(_source: {excludes: %w[foo bar]})
+    end
+    specify do
+      expect(subject.source(excludes: :foo).source(excludes: %i[foo bar]).render[:body])
+        .to include(_source: {excludes: %w[foo bar]})
+    end
+    specify do
+      expect(subject.source(excludes: :foo).source(:bar).render[:body])
+        .to include(_source: {includes: %w[bar], excludes: %w[foo]})
+    end
     specify { expect(subject.source(excludes: :foo).source(false).render[:body]).to include(_source: false) }
-    specify { expect(subject.source(excludes: :foo).source(false).source(excludes: :bar).render[:body]).to include(_source: {excludes: %w[foo bar]}) }
-    specify { expect(subject.source(excludes: :foo).source(false).source(true).render[:body]).to include(_source: {excludes: %w[foo]}) }
+    specify do
+      expect(subject.source(excludes: :foo).source(false).source(excludes: :bar).render[:body])
+        .to include(_source: {excludes: %w[foo bar]})
+    end
+    specify do
+      expect(subject.source(excludes: :foo).source(false).source(true).render[:body])
+        .to include(_source: {excludes: %w[foo]})
+    end
     specify { expect(subject.source(nil).render[:body]).to be_blank }
     specify { expect { subject.source(:foo) }.not_to change { subject.render } }
   end
 
   describe '#stored_fields' do
     specify { expect(subject.stored_fields(:foo).render[:body]).to include(stored_fields: ['foo']) }
-    specify { expect(subject.stored_fields(%i[foo bar]).stored_fields(nil).render[:body]).to include(stored_fields: %w[foo bar]) }
-    specify { expect(subject.stored_fields(:foo).stored_fields(:foo, :bar).render[:body]).to include(stored_fields: %w[foo bar]) }
-    specify { expect(subject.stored_fields(:foo).stored_fields(false).render[:body]).to include(stored_fields: '_none_') }
-    specify { expect(subject.stored_fields(:foo).stored_fields(false).stored_fields(:bar).render[:body]).to include(stored_fields: %w[foo bar]) }
-    specify { expect(subject.stored_fields(:foo).stored_fields(false).stored_fields(true).render[:body]).to include(stored_fields: %w[foo]) }
+    specify do
+      expect(subject.stored_fields(%i[foo bar]).stored_fields(nil).render[:body])
+        .to include(stored_fields: %w[foo bar])
+    end
+    specify do
+      expect(subject.stored_fields(:foo).stored_fields(:foo, :bar).render[:body])
+        .to include(stored_fields: %w[foo bar])
+    end
+    specify do
+      expect(subject.stored_fields(:foo).stored_fields(false).render[:body])
+        .to include(stored_fields: '_none_')
+    end
+    specify do
+      expect(subject.stored_fields(:foo).stored_fields(false).stored_fields(:bar).render[:body])
+        .to include(stored_fields: %w[foo bar])
+    end
+    specify do
+      expect(subject.stored_fields(:foo).stored_fields(false).stored_fields(true).render[:body])
+        .to include(stored_fields: %w[foo])
+    end
     specify { expect(subject.stored_fields(nil).render[:body]).to be_blank }
     specify { expect { subject.stored_fields(:foo) }.not_to change { subject.render } }
   end
@@ -202,8 +287,14 @@ describe Chewy::Search::Request do
   %i[script_fields highlight].each do |name|
     describe "##{name}" do
       specify { expect(subject.send(name, foo: {bar: 42}).render[:body]).to include(name => {'foo' => {bar: 42}}) }
-      specify { expect(subject.send(name, foo: {bar: 42}).send(name, moo: {baz: 43}).render[:body]).to include(name => {'foo' => {bar: 42}, 'moo' => {baz: 43}}) }
-      specify { expect(subject.send(name, foo: {bar: 42}).send(name, nil).render[:body]).to include(name => {'foo' => {bar: 42}}) }
+      specify do
+        expect(subject.send(name, foo: {bar: 42}).send(name, moo: {baz: 43}).render[:body])
+          .to include(name => {'foo' => {bar: 42}, 'moo' => {baz: 43}})
+      end
+      specify do
+        expect(subject.send(name, foo: {bar: 42}).send(name, nil).render[:body])
+          .to include(name => {'foo' => {bar: 42}})
+      end
       specify { expect { subject.send(name, foo: {bar: 42}) }.not_to change { subject.render } }
     end
   end
@@ -211,16 +302,38 @@ describe Chewy::Search::Request do
   %i[suggest aggs].each do |name|
     describe "##{name}" do
       specify { expect(subject.send(name, foo: {bar: 42}).render[:body]).to include(name => {'foo' => {bar: 42}}) }
-      specify { expect(subject.send(name, foo: {bar: 42}).send(name, moo: {baz: 43}).render[:body]).to include(name => {'foo' => {bar: 42}, 'moo' => {baz: 43}}) }
-      specify { expect(subject.send(name, foo: {bar: 42}).send(name, nil).render[:body]).to include(name => {'foo' => {bar: 42}}) }
+      specify do
+        expect(subject.send(name, foo: {bar: 42}).send(name, moo: {baz: 43}).render[:body])
+          .to include(name => {'foo' => {bar: 42}, 'moo' => {baz: 43}})
+      end
+      specify do
+        expect(subject.send(name, foo: {bar: 42}).send(name, nil).render[:body])
+          .to include(name => {'foo' => {bar: 42}})
+      end
       specify { expect { subject.send(name, foo: {bar: 42}) }.not_to change { subject.render } }
     end
   end
 
+  describe '#collapse' do
+    specify { expect(subject.collapse(foo: {bar: 42}).render[:body]).to include(collapse: {'foo' => {bar: 42}}) }
+    specify do
+      expect(subject.collapse(foo: {bar: 42}).collapse(moo: {baz: 43}).render[:body])
+        .to include(collapse: {'moo' => {baz: 43}})
+    end
+    specify { expect(subject.collapse(foo: {bar: 42}).collapse(nil).render[:body]).to be_blank }
+    specify { expect { subject.collapse(foo: {bar: 42}) }.not_to change { subject.render } }
+  end
+
   describe '#docvalue_fields' do
     specify { expect(subject.docvalue_fields(:foo).render[:body]).to include(docvalue_fields: ['foo']) }
-    specify { expect(subject.docvalue_fields(%i[foo bar]).docvalue_fields(nil).render[:body]).to include(docvalue_fields: %w[foo bar]) }
-    specify { expect(subject.docvalue_fields(:foo).docvalue_fields(:foo, :bar).render[:body]).to include(docvalue_fields: %w[foo bar]) }
+    specify do
+      expect(subject.docvalue_fields(%i[foo bar]).docvalue_fields(nil).render[:body])
+        .to include(docvalue_fields: %w[foo bar])
+    end
+    specify do
+      expect(subject.docvalue_fields(:foo).docvalue_fields(:foo, :bar).render[:body])
+        .to include(docvalue_fields: %w[foo bar])
+    end
     specify { expect(subject.docvalue_fields(nil).render[:body]).to be_blank }
     specify { expect { subject.docvalue_fields(:foo) }.not_to change { subject.render } }
   end
@@ -233,25 +346,25 @@ describe Chewy::Search::Request do
     specify { expect { subject.indices(:cities) }.not_to change { subject.render } }
   end
 
-  describe '#types' do
-    specify { expect(subject.types(:product).render[:type]).to contain_exactly('product') }
-    specify { expect(described_class.new(ProductsIndex::City).types(ProductsIndex::Country).render[:type]).to match_array(%w[city country]) }
-    specify { expect(subject.types(%i[product city]).types(nil).render[:type]).to match_array(%w[product city]) }
-    specify { expect(subject.types(:product).types(:product, :city, :something).render[:type]).to match_array(%w[product city]) }
-    specify { expect(subject.types(nil).render[:body]).to be_blank }
-    specify { expect { subject.types(:product) }.not_to change { subject.render } }
-  end
-
   describe '#indices_boost' do
     specify { expect(subject.indices_boost(foo: 1.2).render[:body]).to include(indices_boost: [{'foo' => 1.2}]) }
-    specify { expect(subject.indices_boost(foo: 1.2).indices_boost(moo: 1.3).render[:body]).to include(indices_boost: [{'foo' => 1.2}, {'moo' => 1.3}]) }
-    specify { expect(subject.indices_boost(foo: 1.2).indices_boost(nil).render[:body]).to include(indices_boost: [{'foo' => 1.2}]) }
+    specify do
+      expect(subject.indices_boost(foo: 1.2).indices_boost(moo: 1.3).render[:body])
+        .to include(indices_boost: [{'foo' => 1.2}, {'moo' => 1.3}])
+    end
+    specify do
+      expect(subject.indices_boost(foo: 1.2).indices_boost(nil).render[:body])
+        .to include(indices_boost: [{'foo' => 1.2}])
+    end
     specify { expect { subject.indices_boost(foo: 1.2) }.not_to change { subject.render } }
   end
 
   describe '#rescore' do
     specify { expect(subject.rescore(foo: 42).render[:body]).to include(rescore: [{foo: 42}]) }
-    specify { expect(subject.rescore(foo: 42).rescore(moo: 43).render[:body]).to include(rescore: [{foo: 42}, {moo: 43}]) }
+    specify do
+      expect(subject.rescore(foo: 42).rescore(moo: 43).render[:body])
+        .to include(rescore: [{foo: 42}, {moo: 43}])
+    end
     specify { expect(subject.rescore(foo: 42).rescore(nil).render[:body]).to include(rescore: [{foo: 42}]) }
     specify { expect { subject.rescore(foo: 42) }.not_to change { subject.render } }
   end
@@ -263,9 +376,19 @@ describe Chewy::Search::Request do
     specify { expect { subject.min_score(1.2) }.not_to change { subject.render } }
   end
 
+  describe '#ignore_unavailable' do
+    specify { expect(subject.ignore_unavailable(true).render).to include(ignore_unavailable: true) }
+    specify { expect(subject.ignore_unavailable(true).ignore_unavailable(false).render).to include(ignore_unavailable: false) }
+    specify { expect(subject.ignore_unavailable(true).ignore_unavailable(nil).render[:ignore_unavailable]).to be_blank }
+    specify { expect { subject.ignore_unavailable(true) }.not_to change { subject.render } }
+  end
+
   describe '#search_after' do
     specify { expect(subject.search_after(:foo, :bar).render[:body]).to include(search_after: %i[foo bar]) }
-    specify { expect(subject.search_after(%i[foo bar]).search_after(:baz).render[:body]).to include(search_after: [:baz]) }
+    specify do
+      expect(subject.search_after(%i[foo bar]).search_after(:baz).render[:body])
+        .to include(search_after: [:baz])
+    end
     specify { expect(subject.search_after(:foo).search_after(nil).render[:body]).to be_blank }
     specify { expect { subject.search_after(:foo) }.not_to change { subject.render } }
   end
@@ -276,17 +399,17 @@ describe Chewy::Search::Request do
       stub_model(:country)
 
       stub_index(:places) do
-        define_type City do
-          field :rating, type: 'integer'
-        end
+        index_scope City
+        field :rating, type: 'integer'
+      end
 
-        define_type Country do
-          field :rating, type: 'integer'
-        end
+      stub_index(:countries) do
+        index_scope Country
+        field :rating, type: 'integer'
       end
     end
 
-    before { PlacesIndex.import!(cities: cities, countries: countries) }
+    before { PlacesIndex.import!(cities) }
 
     let(:cities) { Array.new(2) { |i| City.create!(rating: i) } }
     let(:countries) { Array.new(2) { |i| Country.create!(rating: i + 2) } }
@@ -294,14 +417,14 @@ describe Chewy::Search::Request do
     subject { described_class.new(PlacesIndex).order(:rating) }
 
     describe '#objects' do
-      specify { expect(subject.objects).to eq([*cities, *countries]) }
+      specify { expect(subject.objects).to eq([*cities]) }
       specify { expect(subject.objects.class).to eq(Array) }
     end
 
     describe '#load' do
-      specify { expect(subject.load(only: 'city')).to eq([*cities, *countries]) }
-      specify { expect(subject.load(only: 'city').map(&:class).uniq).to eq([PlacesIndex::City, PlacesIndex::Country]) }
-      specify { expect(subject.load(only: 'city').objects).to eq([*cities, nil, nil]) }
+      specify { expect(subject.load(only: 'city')).to eq([*cities]) }
+      specify { expect(subject.load(only: 'city').map(&:class).uniq).to eq([PlacesIndex]) }
+      specify { expect(subject.load(only: 'city').objects).to eq([*cities]) }
     end
   end
 
@@ -320,7 +443,9 @@ describe Chewy::Search::Request do
 
   context do
     let(:first_scope) { subject.query(foo: 'bar').filter.should(moo: 'baz').post_filter.must_not(boo: 'baf').limit(10) }
-    let(:second_scope) { subject.filter(foo: 'bar').post_filter.should(moo: 'baz').query.must_not(boo: 'baf').limit(20) }
+    let(:second_scope) do
+      subject.filter(foo: 'bar').post_filter.should(moo: 'baz').query.must_not(boo: 'baf').limit(20)
+    end
 
     describe '#and' do
       specify do
@@ -388,14 +513,18 @@ describe Chewy::Search::Request do
   end
 
   context 'integration' do
-    let(:products) { Array.new(3) { |i| {id: i.next.to_i, name: "Name#{i.next}", age: 10 * i.next}.stringify_keys! } }
-    let(:cities) { Array.new(3) { |i| {id: (i.next + 3).to_i}.stringify_keys! } }
-    let(:countries) { Array.new(3) { |i| {id: (i.next + 6).to_i}.stringify_keys! } }
+    let(:products_count) { 9 }
+    let(:products) do
+      Array.new(products_count) do |i|
+        {id: i.next.to_i, name: "Name#{i.next}", age: 10 * i.next}.stringify_keys!
+      end
+    end
+    let(:cities) { Array.new(3) { |i| {id: (i.next + 9).to_i}.stringify_keys! } }
+    let(:countries) { Array.new(3) { |i| {id: (i.next + 12).to_i}.stringify_keys! } }
     before do
-      ProductsIndex::Product.import!(products.map { |h| double(h) })
-      ProductsIndex::City.import!(cities.map { |h| double(h) })
-      ProductsIndex::Country.import!(countries.map { |h| double(h) })
-      CitiesIndex::City.import!(cities.map { |h| double(h) })
+      ProductsIndex.import!(products.map { |h| double(h) })
+      CountriesIndex.import!(countries.map { |h| double(h) })
+      CitiesIndex.import!(cities.map { |h| double(h) })
     end
 
     specify { expect(subject[0]._data).to be_a Hash }
@@ -407,18 +536,11 @@ describe Chewy::Search::Request do
       specify { expect(subject.size).to eq(3) }
     end
 
-    context 'limited types' do
-      subject { described_class.new(ProductsIndex::City, ProductsIndex::Country) }
-
-      specify { expect(subject.count).to eq(6) }
-      specify { expect(subject.size).to eq(6) }
-    end
-
-    context 'mixed types' do
-      subject { described_class.new(CitiesIndex, ProductsIndex::Product) }
+    context 'mixed indexes' do
+      subject { described_class.new(CitiesIndex, ProductsIndex) }
 
-      specify { expect(subject.count).to eq(9) }
-      specify { expect(subject.size).to eq(9) }
+      specify { expect(subject.count).to eq(12) }
+      specify { expect(subject.size).to eq(10) } # pagination limit
     end
 
     context 'instrumentation' do
@@ -431,9 +553,7 @@ describe Chewy::Search::Request do
         expect(outer_payload).to eq(
           index: ProductsIndex,
           indexes: [ProductsIndex],
-          request: {index: ['products'], type: %w[city country product], body: {query: {match: {name: 'name3'}}}},
-          type: [ProductsIndex::Product, ProductsIndex::City, ProductsIndex::Country],
-          types: [ProductsIndex::Product, ProductsIndex::City, ProductsIndex::Country]
+          request: {index: ['products'], body: {query: {match: {name: 'name3'}}}}
         )
       end
     end
@@ -444,11 +564,23 @@ describe Chewy::Search::Request do
 
     describe '#highlight' do
       specify { expect(subject.query(match: {name: 'name3'}).highlight(fields: {name: {}}).first.name).to eq('Name3') }
-      specify { expect(subject.query(match: {name: 'name3'}).highlight(fields: {name: {}}).first.name_highlight).to eq('<em>Name3</em>') }
-      specify { expect(subject.query(match: {name: 'name3'}).highlight(fields: {name: {}}).first._data['_source']['name']).to eq('Name3') }
+      specify do
+        expect(subject.query(match: {name: 'name3'}).highlight(fields: {name: {}}).first.name_highlight)
+          .to eq('<em>Name3</em>')
+      end
+      specify do
+        expect(subject.query(match: {name: 'name3'}).highlight(fields: {name: {}}).first.name_highlights)
+          .to eq(['<em>Name3</em>'])
+      end
+      specify do
+        expect(subject.query(match: {name: 'name3'}).highlight(fields: {name: {}}).first._data['_source']['name'])
+          .to eq('Name3')
+      end
     end
 
     describe '#suggest' do
+      let(:products_count) { 3 }
+
       specify do
         expect(subject.suggest(
           foo: {
@@ -470,7 +602,7 @@ describe Chewy::Search::Request do
     describe '#aggs' do
       specify do
         expect(subject.aggs(avg_age: {avg: {field: :age}}).aggs)
-          .to eq('avg_age' => {'value' => 20.0})
+          .to eq('avg_age' => {'value' => 50.0})
       end
     end
 
@@ -490,8 +622,7 @@ describe Chewy::Search::Request do
       specify { expect(subject.count).to eq(9) }
       specify { expect(subject.limit(6).count).to eq(9) }
       specify { expect(subject.offset(6).count).to eq(9) }
-      specify { expect(subject.types(:product, :something).count).to eq(3) }
-      specify { expect(subject.types(:product, :country).count).to eq(6) }
+      specify { expect(subject.indices(:products, CountriesIndex).count).to eq(12) }
       specify { expect(subject.filter(term: {age: 10}).count).to eq(1) }
       specify { expect(subject.query(term: {age: 10}).count).to eq(1) }
       specify { expect(subject.order(nil).count).to eq(9) }
@@ -530,7 +661,7 @@ describe Chewy::Search::Request do
       context do
         before { expect(Chewy.client).to receive(:search).once.and_call_original }
 
-        specify { expect(subject.first).to be_a(ProductsIndex::Country).and have_attributes(id: 9) }
+        specify { expect(subject.first).to be_a(ProductsIndex).and have_attributes(id: 9) }
         specify { expect(subject.first(3).map(&:id)).to eq([9, 8, 7]) }
         specify { expect(subject.first(10).map(&:id)).to have(9).items }
         specify { expect(subject.limit(5).first(10).map(&:id)).to have(9).items }
@@ -543,7 +674,7 @@ describe Chewy::Search::Request do
           expect(Chewy.client).not_to receive(:search)
         end
 
-        specify { expect(subject.first).to be_a(ProductsIndex::Country).and have_attributes(id: 9) }
+        specify { expect(subject.first).to be_a(ProductsIndex).and have_attributes(id: 9) }
         specify { expect(subject.first(3).map(&:id)).to eq([9, 8, 7]) }
         specify { expect(subject.first(10).map(&:id)).to have(9).items }
 
@@ -564,19 +695,37 @@ describe Chewy::Search::Request do
     end
 
     describe '#find' do
-      specify { expect(subject.find('1')).to be_a(ProductsIndex::Product).and have_attributes(id: 1) }
-      specify { expect(subject.find { |w| w.id == 2 }).to be_a(ProductsIndex::Product).and have_attributes(id: 2) }
+      specify { expect(subject.find('1')).to be_a(ProductsIndex).and have_attributes(id: 1) }
+      specify { expect(subject.find { |w| w.id == 2 }).to be_a(ProductsIndex).and have_attributes(id: 2) }
       specify { expect(subject.limit(2).find('1', '3', '7').map(&:id)).to contain_exactly(1, 3, 7) }
       specify { expect(subject.find(1, 3, 7).map(&:id)).to contain_exactly(1, 3, 7) }
-      specify { expect { subject.find('1', '3', '42') }.to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 42' }
-      specify { expect { subject.find(1, 3, 42) }.to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 42' }
-      specify { expect { subject.query(match: {name: 'name3'}).find('1', '3') }.to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 1' }
-      specify { expect { subject.query(match: {name: 'name2'}).find('1', '3') }.to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 1 and 3' }
-      specify { expect { subject.filter(match: {name: 'name2'}).find('1', '3') }.to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 1 and 3' }
-      specify { expect { subject.post_filter(match: {name: 'name2'}).find('1', '3') }.to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 1 and 3' }
+      specify do
+        expect { subject.find('1', '3', '42') }
+          .to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 42'
+      end
+      specify do
+        expect { subject.find(1, 3, 42) }
+          .to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 42'
+      end
+      specify do
+        expect { subject.query(match: {name: 'name3'}).find('1', '3') }
+          .to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 1'
+      end
+      specify do
+        expect { subject.query(match: {name: 'name2'}).find('1', '3') }
+          .to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 1 and 3'
+      end
+      specify do
+        expect { subject.filter(match: {name: 'name2'}).find('1', '3') }
+          .to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 1 and 3'
+      end
+      specify do
+        expect { subject.post_filter(match: {name: 'name2'}).find('1', '3') }
+          .to raise_error Chewy::DocumentNotFound, 'Could not find documents for ids: 1 and 3'
+      end
 
       context 'make sure it returns everything' do
-        let(:countries) { Array.new(6) { |i| {id: (i.next + 6).to_i}.stringify_keys! } }
+        let(:products_count) { 12 }
         before { expect(Chewy.client).not_to receive(:scroll) }
 
         specify { expect(subject.find((1..12).to_a)).to have(12).items }
@@ -587,21 +736,25 @@ describe Chewy::Search::Request do
         before { expect(Chewy.client).to receive(:scroll).once.and_call_original }
 
         specify { expect(subject.find((1..9).to_a)).to have(9).items }
-        specify { expect(subject.find((1..9).to_a)).to all be_a(Chewy::Type) }
+        specify { expect(subject.find((1..9).to_a)).to all be_a(Chewy::Index) }
       end
     end
 
     describe '#pluck' do
       specify { expect(subject.limit(5).pluck(:_id)).to eq(%w[1 2 3 4 5]) }
-      specify { expect(subject.limit(5).pluck(:_id, :age)).to eq([['1', 10], ['2', 20], ['3', 30], ['4', nil], ['5', nil]]) }
-      specify { expect(subject.limit(5).source(:name).pluck(:id, :age)).to eq([[1, 10], [2, 20], [3, 30], [4, nil], [5, nil]]) }
-      specify do
-        expect(subject.limit(5).pluck(:_index, :_type, :name)).to eq([
-          %w[products product Name1],
-          %w[products product Name2],
-          %w[products product Name3],
-          ['products', 'city', nil],
-          ['products', 'city', nil]
+      specify do
+        expect(subject.limit(5).pluck(:_id, :age)).to eq([['1', 10], ['2', 20], ['3', 30], ['4', 40], ['5', 50]])
+      end
+      specify do
+        expect(subject.limit(5).source(:name).pluck(:id, :age)).to eq([[1, 10], [2, 20], [3, 30], [4, 40], [5, 50]])
+      end
+      specify do
+        expect(subject.limit(5).pluck(:_index, :name)).to eq([
+          %w[products Name1],
+          %w[products Name2],
+          %w[products Name3],
+          %w[products Name4],
+          %w[products Name5]
         ])
       end
 
@@ -632,24 +785,12 @@ describe Chewy::Search::Request do
           Chewy.client.indices.refresh(index: 'products')
         end.to change { described_class.new(ProductsIndex).total_count }.from(9).to(7)
       end
-      specify do
-        expect do
-          subject.types(:product).delete_all
-          Chewy.client.indices.refresh(index: 'products')
-        end.to change { described_class.new(ProductsIndex::Product).total_entries }.from(3).to(0)
-      end
       specify do
         expect do
           subject.delete_all
           Chewy.client.indices.refresh(index: 'products')
         end.to change { described_class.new(ProductsIndex).total }.from(9).to(0)
       end
-      specify do
-        expect do
-          described_class.new(ProductsIndex::City).delete_all
-          Chewy.client.indices.refresh(index: 'products')
-        end.to change { described_class.new(ProductsIndex).total }.from(9).to(6)
-      end
 
       specify do
         outer_payload = nil
@@ -660,9 +801,7 @@ describe Chewy::Search::Request do
         expect(outer_payload).to eq(
           index: ProductsIndex,
           indexes: [ProductsIndex],
-          request: {index: ['products'], type: %w[city country product], body: {query: {match: {name: 'name3'}}}, refresh: true},
-          type: [ProductsIndex::Product, ProductsIndex::City, ProductsIndex::Country],
-          types: [ProductsIndex::Product, ProductsIndex::City, ProductsIndex::Country]
+          request: {index: ['products'], body: {query: {match: {name: 'name3'}}}, refresh: true}
         )
       end
 
@@ -675,11 +814,67 @@ describe Chewy::Search::Request do
         expect(outer_payload).to eq(
           index: ProductsIndex,
           indexes: [ProductsIndex],
-          request: {index: ['products'], type: %w[city country product], body: {query: {match: {name: 'name3'}}}, refresh: false},
-          type: [ProductsIndex::Product, ProductsIndex::City, ProductsIndex::Country],
-          types: [ProductsIndex::Product, ProductsIndex::City, ProductsIndex::Country]
+          request: {index: ['products'], body: {query: {match: {name: 'name3'}}}, refresh: false}
         )
       end
+
+      it 'delete records asynchronously' do
+        outer_payload = nil
+        ActiveSupport::Notifications.subscribe('delete_query.chewy') do |_name, _start, _finish, _id, payload|
+          outer_payload = payload
+        end
+        subject.query(match: {name: 'name3'}).delete_all(
+          refresh: false,
+          wait_for_completion: false,
+          requests_per_second: 10.0,
+          scroll_size: 2000
+        )
+        expect(outer_payload).to eq(
+          index: ProductsIndex,
+          indexes: [ProductsIndex],
+          request: {
+            index: ['products'],
+            body: {query: {match: {name: 'name3'}}},
+            refresh: false,
+            wait_for_completion: false,
+            requests_per_second: 10.0,
+            scroll_size: 2000
+          }
+        )
+      end
+    end
+
+    describe '#response=' do
+      let(:query) { ProductsIndex.limit(0) }
+      let(:raw_response) { Chewy.client.search(query.render) }
+
+      it 'wraps and assigns the raw response' do
+        query.response = raw_response
+        expect(query.response).to be_a(Chewy::Search::Response)
+      end
+    end
+
+    describe '#performed?' do
+      let(:query) { ProductsIndex.limit(0) }
+      let(:raw_response) { Chewy.client.search(query.render) }
+
+      it 'is false on a new query' do
+        expect(query.performed?).to eq(false)
+      end
+
+      it 'is true after the search request was issued' do
+        expect do
+          # The `response` method has a side effect of performing unperformed
+          # queries.
+          query.response
+        end.to change(query, :performed?).from(false).to(true)
+      end
+
+      it 'is true after assigning a raw response' do
+        expect do
+          query.response = raw_response
+        end.to change(query, :performed?).from(false).to(true)
+      end
     end
   end
 end