chewy 6.0.0 → 7.0.0

data/spec/chewy/index/aliases_spec.rb

@@ -10,13 +10,13 @@ describe Chewy::Index::Aliases do
 
     context do
       before { DummiesIndex.create! }
-      specify { expect(DummiesIndex.indexes).to eq([]) }
+      specify { expect(DummiesIndex.indexes).to eq(['dummies']) }
     end
 
     context do
       before { DummiesIndex.create! }
       before { Chewy.client.indices.put_alias index: 'dummies', name: 'dummies_2013' }
-      specify { expect(DummiesIndex.indexes).to eq([]) }
+      specify { expect(DummiesIndex.indexes).to eq(['dummies']) }
     end
 
     context do
@@ -43,7 +43,7 @@ describe Chewy::Index::Aliases do
 
     context do
       before { DummiesIndex.create! '2013' }
-      specify { expect(DummiesIndex.aliases).to eq([]) }
+      specify { expect(DummiesIndex.aliases).to eq(['dummies']) }
     end
   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 >= '5.6' }
-    specify { expect(described_class.version).to be < '7.0' }
+    specify { expect(described_class.version).to be >= '6.8' }
+    specify { expect(described_class.version).to be < '8.0' }
   end
 end

data/spec/chewy/search/request_spec.rb

@@ -420,10 +420,12 @@ describe Chewy::Search::Request do
           outer_payload = payload
         end
         subject.query(match: {name: 'name3'}).to_a
+        request = {index: ['products'], type: %w[product], body: {query: {match: {name: 'name3'}}}}
+        request[:rest_total_hits_as_int] = true if Chewy::Runtime.version >= '7.0.0'
         expect(outer_payload).to eq(
           index: ProductsIndex,
           indexes: [ProductsIndex],
-          request: {index: ['products'], type: %w[product], body: {query: {match: {name: 'name3'}}}},
+          request: request,
           type: ProductsIndex::Product,
           types: [ProductsIndex::Product]
         )

data/spec/chewy/search/scrolling_spec.rb

@@ -119,12 +119,13 @@ describe Chewy::Search::Scrolling, :orm do
             outer_payload << payload
           end
           request.scroll_batches(batch_size: 3).to_a
-
+          request = {index: %w[cities countries], type: %w[city country], body: {sort: ['rating']}, size: 3, scroll: '1m'}
+          request[:rest_total_hits_as_int] = true if Chewy::Runtime.version >= '7.0.0'
           expect(outer_payload).to match_array([
             hash_including(
               index: [CitiesIndex, CountriesIndex],
               indexes: [CitiesIndex, CountriesIndex],
-              request: {index: %w[cities countries], type: %w[city country], body: {sort: ['rating']}, size: 3, scroll: '1m'},
+              request: request,
               type: [CitiesIndex::City, CountriesIndex::Country],
               types: [CitiesIndex::City, CountriesIndex::Country]
             ),

data/spec/chewy/type/import_spec.rb

@@ -158,6 +158,15 @@ describe Chewy::Type::Import do
         specify do
           expect { import City.where(id: dummy_cities.first.id) }.to update_index(CitiesIndex::City).and_reindex(dummy_cities.first).only
         end
+
+        specify do
+          allow(CitiesIndex::City).to receive(:import_linear).and_return(double(present?: false))
+          allow(CitiesIndex::City).to receive(:import_parallel).and_return(double(present?: false))
+
+          expects_no_query(except: /SELECT\s+1\s+AS\s+one\s+FROM/) do
+            import City.where(id: dummy_cities.first.id)
+          end
+        end
       end
     end
 

data/spec/support/active_record.rb

@@ -39,14 +39,15 @@ module ActiveRecordClassHelpers
     raise 'Expected some db queries, but none were made' unless have_queries
   end
 
-  def expects_no_query(&block)
+  def expects_no_query(except: nil, &block)
     queries = []
     ActiveSupport::Notifications.subscribed(
       ->(*args) { queries << args[4][:sql] },
       'sql.active_record',
       &block
     )
-    raise "Expected no DB queries, but the following ones were made: #{queries.join(', ')}" if queries.present?
+    ofending_queries = except ? queries.find_all { |query| !query.match(except) } : queries
+    raise "Expected no DB queries, but the following ones were made: #{ofending_queries.join(', ')}" if ofending_queries.present?
   end
 
   def stub_model(name, superclass = nil, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Toptal, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -245,6 +245,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -252,6 +255,8 @@ files:
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE.txt