chewy 7.6.0 → 8.0.0

data/gemfiles/{rails.7.0.activerecord.gemfile → rails.8.0.activerecord.gemfile}

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'activejob', '~> 7.0.0'
-gem 'activerecord', '~> 7.0.0'
-gem 'activesupport', '~> 7.0.0'
+gem 'activejob', '~> 8.0.0'
+gem 'activerecord', '~> 8.0.0'
+gem 'activesupport', '~> 8.0.0'
 gem 'kaminari-core', '~> 1.1.0', require: false
 gem 'parallel', require: false
 gem 'rspec_junit_formatter', '~> 0.4.1'

data/lib/chewy/config.rb

@@ -70,12 +70,12 @@ module Chewy
     end
 
     def transport_logger=(logger)
-      Chewy.client.transport.transport.logger = logger
+      Chewy.client.transport.logger = logger
       @transport_logger = logger
     end
 
     def transport_tracer=(tracer)
-      Chewy.client.transport.transport.tracer = tracer
+      Chewy.client.transport.tracer = tracer
       @transport_tracer = tracer
     end
 

data/lib/chewy/errors.rb

@@ -39,4 +39,7 @@ module Chewy
 
   class ImportScopeCleanupError < Error
   end
+
+  class FeatureDisabled < Error
+  end
 end

data/lib/chewy/fields/root.rb

@@ -4,7 +4,7 @@ module Chewy
       attr_reader :dynamic_templates, :id
 
       def initialize(name, **options)
-        super(name, **options)
+        super
 
         @value ||= -> { self }
         @dynamic_templates = []

data/lib/chewy/index/actions.rb

@@ -32,7 +32,7 @@ module Chewy
         #
         def create(*args, **kwargs)
           create!(*args, **kwargs)
-        rescue Elasticsearch::Transport::Transport::Errors::BadRequest
+        rescue Elastic::Transport::Transport::Errors::BadRequest
           false
         end
 
@@ -83,9 +83,9 @@ module Chewy
           result = client.indices.delete index: index_names.join(',')
           Chewy.wait_for_status if result
           result
-          # es-ruby >= 1.0.10 handles Elasticsearch::Transport::Transport::Errors::NotFound
+          # es-ruby >= 1.0.10 handles Elastic::Transport::Transport::Errors::NotFound
           # by itself, rescue is for previous versions
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+        rescue Elastic::Transport::Transport::Errors::NotFound
           false
         end
 
@@ -99,9 +99,9 @@ module Chewy
         #   UsersIndex.delete '01-2014' # deletes `users_01-2014` index
         #
         def delete!(suffix = nil)
-          # es-ruby >= 1.0.10 handles Elasticsearch::Transport::Transport::Errors::NotFound
+          # es-ruby >= 1.0.10 handles Elastic::Transport::Transport::Errors::NotFound
           # by itself, so it is raised here
-          delete(suffix) or raise Elasticsearch::Transport::Transport::Errors::NotFound
+          delete(suffix) or raise Elastic::Transport::Transport::Errors::NotFound
         end
 
         # Deletes and recreates index. Supports suffixes.

data/lib/chewy/index/aliases.rb

@@ -22,7 +22,7 @@ module Chewy
 
         def empty_if_not_found
           yield
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+        rescue Elastic::Transport::Transport::Errors::NotFound
           []
         end
       end

data/lib/chewy/index/syncer.rb

@@ -157,8 +157,8 @@ module Chewy
             batch_size: DEFAULT_SYNC_BATCH_SIZE,
             typecast: false
           }
-          @index.adapter.import_fields(import_fields_args).to_a.flatten(1).each do |data|
-            data[0] = data[0].to_s
+          @index.adapter.import_fields(import_fields_args).to_a.flatten(1).map do |data|
+            [data[0].to_s, *data[1..]]
           end
         else
           @index.adapter.import_fields(batch_size: DEFAULT_SYNC_BATCH_SIZE, typecast: false).to_a.flatten(1).map(&:to_s)
@@ -167,8 +167,8 @@ module Chewy
 
       def fetch_index_data
         if @index.supports_outdated_sync?
-          @index.pluck(:_id, @index.outdated_sync_field).each do |data|
-            data[0] = data[0].to_s
+          @index.pluck(:_id, @index.outdated_sync_field).map do |data|
+            [data[0].to_s, *data[1..]]
           end
         else
           @index.pluck(:_id).map(&:to_s)
@@ -213,7 +213,7 @@ module Chewy
         @outdated_sync_field_type = mappings
           .fetch('properties', {})
           .fetch(@index.outdated_sync_field.to_s, {})['type']
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      rescue Elastic::Transport::Transport::Errors::NotFound
         nil
       end
     end

data/lib/chewy/minitest/helpers.rb

@@ -142,7 +142,7 @@ module Chewy
         teardown do
           # always destroy indexes between tests
           # Prevent croll pollution of test cases due to indexing
-          Chewy.massacre
+          drop_indices
         end
       end
     end

data/lib/chewy/search/request.rb

@@ -46,7 +46,7 @@ module Chewy
 
       delegate :hits, :wrappers, :objects, :records, :documents,
                :object_hash, :record_hash, :document_hash,
-               :total, :max_score, :took, :timed_out?, to: :response
+               :total, :max_score, :took, :timed_out?, :terminated_early?, to: :response
       delegate :each, :size, :to_a, :[], to: :wrappers
       alias_method :to_ary, :to_a
       alias_method :total_count, :total
@@ -854,7 +854,7 @@ module Chewy
         else
           Chewy.client.count(only(WHERE_STORAGES).render)['count']
         end
-      rescue Elasticsearch::Transport::Transport::Errors::NotFound
+      rescue Elastic::Transport::Transport::Errors::NotFound
         0
       end
 
@@ -891,7 +891,7 @@ module Chewy
       def first(limit = UNDEFINED)
         request_limit = limit == UNDEFINED ? 1 : limit
 
-        if performed? && (request_limit <= size || size == total)
+        if performed? && (terminated_early? || request_limit <= size || size == total)
           limit == UNDEFINED ? wrappers.first : wrappers.first(limit)
         else
           result = except(EXTRA_STORAGES).limit(request_limit).to_a
@@ -1035,7 +1035,7 @@ module Chewy
         request_body = render.merge(additional)
         ActiveSupport::Notifications.instrument 'search_query.chewy', notification_payload(request: request_body) do
           Chewy.client.search(request_body)
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+        rescue Elastic::Transport::Transport::Errors::NotFound
           {}
         end
       end

data/lib/chewy/search/response.rb

@@ -47,6 +47,13 @@ module Chewy
         @timed_out ||= @body['timed_out']
       end
 
+      # Has the request been terminated early?
+      #
+      # @return [true, false]
+      def terminated_early?
+        @terminated_early ||= @body['terminated_early']
+      end
+
       # The `suggest` response part. Returns empty hash if suggests
       # were not requested.
       #

data/lib/chewy/search/scrolling.rb

@@ -39,7 +39,8 @@ module Chewy
           hits = hits.first(last_batch_size) if last_batch_size != 0 && fetched >= total
           yield(hits) if hits.present?
           scroll_id = result['_scroll_id']
-          break if fetched >= total
+
+          break if result['terminated_early'] || fetched >= total
 
           result = perform_scroll(scroll: scroll, scroll_id: scroll_id)
         end

data/lib/chewy/strategy/delayed_sidekiq/worker.rb

@@ -68,7 +68,7 @@ module Chewy
 
           fields = nil if fields.include?(Scheduler::FALLBACK_FIELDS)
 
-          [ids.map(&:to_i), fields]
+          [ids, fields]
         end
       end
     end

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '7.6.0'.freeze
+  VERSION = '8.0.0'.freeze
 end

data/lib/chewy.rb

@@ -116,6 +116,10 @@ module Chewy
     # Be careful, if current prefix is blank, this will destroy all the indexes.
     #
     def massacre
+      unless Chewy.settings[:delete_all_enabled]
+        raise FeatureDisabled, 'Feature disabled by default in ES 8. You can enable it in the cluster and set `delete_all_enabled` option in settings'
+      end
+
       Chewy.client.indices.delete(index: [Chewy.configuration[:prefix], '*'].reject(&:blank?).join('_'))
       Chewy.wait_for_status
     end

data/migration_guide.md

@@ -23,7 +23,7 @@ In order to upgrade Chewy 6/Elasticsearch 6 to Chewy 7/Elasticsearch 7 in the mo
 * Run manual tests on Chewy 7.1 / Elasticsearch 7
 * Upgrade to Chewy 7.1
 * Upgrade to Chewy 7.2:
-  * Remove all the the `Chewy::Type` class usages, e.g. remove `CitiesIndex::City` / `CitiesIndex.city`
+  * Remove all the `Chewy::Type` class usages, e.g. remove `CitiesIndex::City` / `CitiesIndex.city`
     * `CitiesIndex::City.import! ...` becomes `CitiesIndex.import! ...`
   * Update indexes with simplified DSL:
     * `define_type` block -> `index_scope` clause

data/spec/chewy/config_spec.rb

@@ -3,18 +3,17 @@ require 'spec_helper'
 describe Chewy::Config do
   subject { described_class.send(:new) }
 
-  its(:logger) { should be_nil }
-  its(:transport_logger) { should be_nil }
-  its(:transport_logger) { should be_nil }
-  its(:root_strategy) { should == :base }
-  its(:request_strategy) { should == :atomic }
-  its(:console_strategy) { should == :urgent }
-  its(:use_after_commit_callbacks) { should == true }
-  its(:indices_path) { should == 'app/chewy' }
-  its(:reset_disable_refresh_interval) { should == false }
-  its(:reset_no_replicas) { should == false }
-  its(:disable_refresh_async) { should == false }
-  its(:search_class) { should be < Chewy::Search::Request }
+  specify { expect(subject.logger).to be_nil }
+  specify { expect(subject.transport_logger).to be_nil }
+  specify { expect(subject.root_strategy).to eq(:base) }
+  specify { expect(subject.request_strategy).to eq(:atomic) }
+  specify { expect(subject.console_strategy).to eq(:urgent) }
+  specify { expect(subject.use_after_commit_callbacks).to eq(true) }
+  specify { expect(subject.indices_path).to eq('app/chewy') }
+  specify { expect(subject.reset_disable_refresh_interval).to eq(false) }
+  specify { expect(subject.reset_no_replicas).to eq(false) }
+  specify { expect(subject.disable_refresh_async).to eq(false) }
+  specify { expect(subject.search_class).to be < Chewy::Search::Request }
 
   describe '#transport_logger=' do
     let(:logger) { Logger.new('/dev/null') }
@@ -22,7 +21,7 @@ describe Chewy::Config do
 
     specify do
       expect { subject.transport_logger = logger }
-        .to change { Chewy.client.transport.transport.logger }.to(logger)
+        .to change { Chewy.client.transport.logger }.to(logger)
     end
     specify do
       expect { subject.transport_logger = logger }
@@ -40,7 +39,7 @@ describe Chewy::Config do
 
     specify do
       expect { subject.transport_tracer = tracer }
-        .to change { Chewy.client.transport.transport.tracer }.to(tracer)
+        .to change { Chewy.client.transport.tracer }.to(tracer)
     end
     specify do
       expect { subject.transport_tracer = tracer }

data/spec/chewy/elastic_client_spec.rb

@@ -6,7 +6,7 @@ describe Chewy::ElasticClient do
     let!(:filter_previous_value) { Chewy.before_es_request_filter }
 
     before do
-      Chewy.massacre
+      drop_indices
       stub_index(:products) do
         field :id, type: :integer
       end

data/spec/chewy/fields/base_spec.rb

@@ -5,7 +5,7 @@ describe Chewy::Fields::Base do
   specify { expect(described_class.new('name', type: 'integer').options[:type]).to eq('integer') }
 
   describe '#compose' do
-    let(:field) { described_class.new(:name, value: ->(o) { o.value }) }
+    let(:field) { described_class.new(:name, value: lambda(&:value)) }
 
     specify { expect(field.compose(double(value: 'hello'))).to eq(name: 'hello') }
     specify { expect(field.compose(double(value: %w[hello world]))).to eq(name: %w[hello world]) }
@@ -23,7 +23,7 @@ describe Chewy::Fields::Base do
 
     context 'nested fields' do
       before do
-        field.children.push(described_class.new(:subname1, value: ->(o) { o.subvalue1 }))
+        field.children.push(described_class.new(:subname1, value: lambda(&:subvalue1)))
         field.children.push(described_class.new(:subname2, value: -> { subvalue2 }))
         field.children.push(described_class.new(:subname3))
       end

data/spec/chewy/fields/time_fields_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Time fields' do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_index(:posts) do

data/spec/chewy/index/actions_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Index::Actions do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_index :dummies
@@ -78,12 +78,12 @@ describe Chewy::Index::Actions do
       specify do
         expect do
           DummiesIndex.create!
-        end.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/already exists.*dummies/)
+        end.to raise_error(Elastic::Transport::Transport::Errors::BadRequest).with_message(/already exists.*dummies/)
       end
       specify do
         expect do
           DummiesIndex.create!('2013')
-        end.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/Invalid alias name \[dummies\]/)
+        end.to raise_error(Elastic::Transport::Transport::Errors::BadRequest).with_message(/Invalid alias name \[dummies\]/)
       end
     end
 
@@ -100,7 +100,7 @@ describe Chewy::Index::Actions do
       specify do
         expect do
           DummiesIndex.create!('2013')
-        end.to raise_error(Elasticsearch::Transport::Transport::Errors::BadRequest).with_message(/already exists.*dummies_2013/)
+        end.to raise_error(Elastic::Transport::Transport::Errors::BadRequest).with_message(/already exists.*dummies_2013/)
       end
       specify { expect(DummiesIndex.create!('2014')['acknowledged']).to eq(true) }
 
@@ -190,11 +190,11 @@ describe Chewy::Index::Actions do
   end
 
   describe '.delete!' do
-    specify { expect { DummiesIndex.delete! }.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound) }
+    specify { expect { DummiesIndex.delete! }.to raise_error(Elastic::Transport::Transport::Errors::NotFound) }
     specify do
       expect do
         DummiesIndex.delete!('2013')
-      end.to raise_error(Elasticsearch::Transport::Transport::Errors::NotFound)
+      end.to raise_error(Elastic::Transport::Transport::Errors::NotFound)
     end
 
     context do
@@ -583,67 +583,6 @@ describe Chewy::Index::Actions do
       end
     end
 
-    xcontext 'applying journal' do
-      before do
-        stub_index(:cities) do
-          index_scope City
-          field :name, value: (lambda do
-            sleep(rating)
-            name
-          end)
-        end
-      end
-
-      let!(:cities) { Array.new(3) { |i| City.create!(id: i + 1, name: "Name#{i + 1}", rating: 1) } }
-
-      let(:parallel_update) do
-        Thread.new do
-          p 'start parallel'
-          sleep(1.5)
-          cities.first.update(name: 'NewName1', rating: 0)
-          cities.last.update(name: 'NewName3', rating: 0)
-          CitiesIndex::City.import!([cities.first, cities.last], journal: true)
-          p 'end parallel'
-        end
-      end
-
-      specify 'with journal application' do
-        cities
-        p 'cities created1'
-        ActiveRecord::Base.connection.close if defined?(ActiveRecord::Base)
-        [
-          parallel_update,
-          Thread.new do
-            p 'start reset1'
-            CitiesIndex.reset!('suffix')
-            p 'end reset1'
-          end
-        ].map(&:join)
-        ActiveRecord::Base.connection.reconnect! if defined?(ActiveRecord::Base)
-        p 'expect1'
-        expect(CitiesIndex::City.pluck(:_id, :name)).to contain_exactly(%w[1 NewName1], %w[2 Name2], %w[3 NewName3])
-        p 'end expect1'
-      end
-
-      specify 'without journal application' do
-        cities
-        p 'cities created2'
-        ActiveRecord::Base.connection.close if defined?(ActiveRecord::Base)
-        [
-          parallel_update,
-          Thread.new do
-            p 'start reset2'
-            CitiesIndex.reset!('suffix', apply_journal: false)
-            p 'end reset2'
-          end
-        ].map(&:join)
-        ActiveRecord::Base.connection.reconnect! if defined?(ActiveRecord::Base)
-        p 'expect2'
-        expect(CitiesIndex::City.pluck(:_id, :name)).to contain_exactly(%w[1 Name1], %w[2 Name2], %w[3 Name3])
-        p 'end expect2'
-      end
-    end
-
     context 'journaling' do
       before { City.create!(id: 1, name: 'Moscow') }
 
@@ -768,7 +707,7 @@ describe Chewy::Index::Actions do
           .to receive(:clear_cache)
           .and_call_original
         expect { CitiesIndex.clear_cache({index: unexisted_index_name}) }
-          .to raise_error Elasticsearch::Transport::Transport::Errors::NotFound
+          .to raise_error Elastic::Transport::Transport::Errors::NotFound
       end
     end
 
@@ -820,7 +759,7 @@ describe Chewy::Index::Actions do
             .to receive(:reindex)
             .and_call_original
           expect { CitiesIndex.reindex(source: unexisting_index, dest: dest_index_with_prefix) }
-            .to raise_error Elasticsearch::Transport::Transport::Errors::NotFound
+            .to raise_error Elastic::Transport::Transport::Errors::NotFound
         end
       end
 
@@ -883,7 +822,7 @@ describe Chewy::Index::Actions do
       context 'index name' do
         specify do
           expect { CitiesIndex.update_mapping(unexisting_index, body_hash) }
-            .to raise_error Elasticsearch::Transport::Transport::Errors::NotFound
+            .to raise_error Elastic::Transport::Transport::Errors::NotFound
         end
       end
 

data/spec/chewy/index/aliases_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Index::Aliases do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before { stub_index :dummies }
 

data/spec/chewy/index/import/bulk_builder_spec.rb

@@ -17,7 +17,7 @@ SimpleComment = Class.new do
 end
 
 describe Chewy::Index::Import::BulkBuilder do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   subject { described_class.new(index, to_index: to_index, delete: delete, fields: fields) }
   let(:index) { CitiesIndex }
@@ -216,7 +216,7 @@ describe Chewy::Index::Import::BulkBuilder do
       end
 
       def do_raw_index_comment(options:, data:)
-        CommentsIndex.client.index(options.merge(index: 'comments', type: '_doc', refresh: true, body: data))
+        CommentsIndex.client.index(options.merge(index: 'comments', refresh: true, body: data))
       end
 
       def raw_index_comment(comment)

data/spec/chewy/index/import/bulk_request_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Index::Import::BulkRequest do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   subject { described_class.new(index, suffix: suffix, bulk_size: bulk_size, **bulk_options) }
   let(:suffix) {}

data/spec/chewy/index/import/routine_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # TODO: add more specs here later
 describe Chewy::Index::Import::Routine do
-  before { Chewy.massacre }
+  before { drop_indices }
   before do
     stub_index(:cities) do
       field :name

data/spec/chewy/index/import_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Index::Import do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   before do
     stub_model(:city)
@@ -204,10 +204,10 @@ describe Chewy::Index::Import do
           end
         end
 
-        let(:mapper_parsing_exception) do
+        let(:document_parsing_exception) do
           {
-            'type' => 'mapper_parsing_exception',
-            'reason' => 'object mapping for [name] tried to parse field [name] as object, but found a concrete value'
+            'type' => 'document_parsing_exception',
+            'reason' => '[1:9] object mapping for [name] tried to parse field [name] as object, but found a concrete value'
           }
         end
 
@@ -215,7 +215,7 @@ describe Chewy::Index::Import do
           payload = subscribe_notification
           import dummy_cities, batch_size: 2
           expect(payload).to eq(index: CitiesIndex,
-                                errors: {index: {mapper_parsing_exception => %w[1 2 3]}},
+                                errors: {index: {document_parsing_exception => %w[1 2 3]}},
                                 import: {index: 3})
         end
       end
@@ -270,8 +270,8 @@ describe Chewy::Index::Import do
         expect(payload).to eq(
           errors: {
             index: {{
-              'type' => 'mapper_parsing_exception',
-              'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'
+              'type' => 'document_parsing_exception',
+              'reason' => '[1:27] object mapping for [object] tried to parse field [object] as object, but found a concrete value'
             } => %w[2 4]}
           },
           import: {index: 6},
@@ -293,8 +293,8 @@ describe Chewy::Index::Import do
         expect(payload).to eq(
           errors: {
             index: {{
-              'type' => 'mapper_parsing_exception',
-              'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'
+              'type' => 'document_parsing_exception',
+              'reason' => '[1:27] object mapping for [object] tried to parse field [object] as object, but found a concrete value'
             } => %w[2 4]}
           },
           import: {index: 6},
@@ -319,8 +319,8 @@ describe Chewy::Index::Import do
           expect(payload).to eq(
             errors: {
               index: {{
-                'type' => 'mapper_parsing_exception',
-                'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'
+                'type' => 'document_parsing_exception',
+                'reason' => '[1:27] object mapping for [object] tried to parse field [object] as object, but found a concrete value'
               } => %w[2 4]}
             },
             import: {index: 6},
@@ -383,8 +383,8 @@ describe Chewy::Index::Import do
 
           # Full match doesn't work here.
           expect(payload[:errors][:update].keys).to match([
-            hash_including('type' => 'document_missing_exception', 'reason' => '[_doc][1]: document missing'),
-            hash_including('type' => 'document_missing_exception', 'reason' => '[_doc][3]: document missing')
+            hash_including('type' => 'document_missing_exception', 'reason' => '[1]: document missing'),
+            hash_including('type' => 'document_missing_exception', 'reason' => '[3]: document missing')
           ])
           expect(payload[:errors][:update].values).to eq([['1'], ['3']])
           expect(imported_cities).to match_array([
@@ -431,8 +431,8 @@ describe Chewy::Index::Import do
           expect(payload).to eq(
             errors: {
               update: {{
-                'type' => 'mapper_parsing_exception',
-                'reason' => 'object mapping for [object] tried to parse field [object] as object, but found a concrete value'
+                'type' => 'document_parsing_exception',
+                'reason' => '[1:26] object mapping for [object] tried to parse field [object] as object, but found a concrete value'
               } => %w[2 4]}
             },
             import: {index: 6},

data/spec/chewy/index/observe/callback_spec.rb

@@ -21,7 +21,7 @@ describe Chewy::Index::Observe::Callback do
     end
 
     context 'when executable is has arity 1' do
-      let(:executable) { ->(record) { record.population } }
+      let(:executable) { lambda(&:population) }
 
       it 'calls exectuable within context' do
         expect(callback.call(city)).to eq(city.population)

data/spec/chewy/index/specification_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Index::Specification do
-  before { Chewy.massacre }
+  before { drop_indices }
 
   let(:index1) do
     stub_index(:places) do
@@ -46,7 +46,6 @@ describe Chewy::Index::Specification do
     specify do
       expect { specification1.lock! }.to change { Chewy::Stash::Specification.all.hits }.from([]).to([{
         '_index' => 'chewy_specifications',
-        '_type' => '_doc',
         '_id' => 'places',
         '_score' => 1.0,
         '_source' => {'specification' => Base64.encode64({
@@ -62,7 +61,6 @@ describe Chewy::Index::Specification do
       specify do
         expect { specification5.lock! }.to change { Chewy::Stash::Specification.all.hits }.to([{
           '_index' => 'chewy_specifications',
-          '_type' => '_doc',
           '_id' => 'places',
           '_score' => 1.0,
           '_source' => {'specification' => Base64.encode64({
@@ -71,7 +69,6 @@ describe Chewy::Index::Specification do
           }.to_json)}
         }, {
           '_index' => 'chewy_specifications',
-          '_type' => '_doc',
           '_id' => 'namespace/cities',
           '_score' => 1.0,
           '_source' => {'specification' => Base64.encode64({

data/spec/chewy/index/syncer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Index::Syncer, :orm do
-  before { Chewy.massacre }
+  before { drop_indices }
   before do
     stub_model(:city)
     stub_index(:cities) do

data/spec/chewy/index_spec.rb

@@ -177,7 +177,7 @@ describe Chewy::Index do
 
     context do
       before do
-        Chewy.massacre
+        drop_indices
         PlacesIndex.import!(
           double(colors: ['red']),
           double(colors: %w[red green]),