chewy 0.10.1 → 5.0.0

data/spec/chewy/index/specification_spec.rb

@@ -6,7 +6,7 @@ describe Chewy::Index::Specification do
   let(:index1) do
     stub_index(:places) do
       define_type(:city) do
-        field :name, type: 'string'
+        field :founded_on, type: 'date'
       end
     end
   end
@@ -15,7 +15,7 @@ describe Chewy::Index::Specification do
     stub_index(:places) do
       settings analyzer: {}
       define_type(:city) do
-        field :name, type: 'string'
+        field :founded_on, type: 'date'
       end
     end
   end
@@ -23,7 +23,7 @@ describe Chewy::Index::Specification do
   let(:index3) do
     stub_index(:places) do
       define_type(:city) do
-        field :name, type: 'string'
+        field :founded_on, type: 'date'
         field :population, type: 'integer'
       end
     end
@@ -33,7 +33,7 @@ describe Chewy::Index::Specification do
     stub_index(:places) do
       define_type(:city) do
         field :population, type: 'integer'
-        field :name, type: 'string'
+        field :founded_on, type: 'date'
       end
     end
   end
@@ -55,11 +55,14 @@ describe Chewy::Index::Specification do
   describe '#lock!' do
     specify do
       expect { specification1.lock! }.to change { Chewy::Stash::Specification.all.hits }.from([]).to([{
-        '_index' => 'chewy_stash',
+        '_index' => 'chewy_specifications',
         '_type' => 'specification',
         '_id' => 'places',
         '_score' => 1.0,
-        '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"name":{"type":"string"}}}}}'}
+        '_source' => {'specification' => Base64.encode64({
+          'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+        }.to_json)}
       }])
     end
 
@@ -68,17 +71,23 @@ describe Chewy::Index::Specification do
 
       specify do
         expect { specification5.lock! }.to change { Chewy::Stash::Specification.all.hits }.to([{
-          '_index' => 'chewy_stash',
+          '_index' => 'chewy_specifications',
           '_type' => 'specification',
           '_id' => 'places',
           '_score' => 1.0,
-          '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"name":{"type":"string"}}}}}'}
+          '_source' => {'specification' => Base64.encode64({
+            'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+            'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
+          }.to_json)}
         }, {
-          '_index' => 'chewy_stash',
+          '_index' => 'chewy_specifications',
           '_type' => 'specification',
           '_id' => 'namespace/cities',
           '_score' => 1.0,
-          '_source' => {'value' => '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":0}},"mappings":{"city":{"properties":{"population":{"type":"integer"}}}}}'}
+          '_source' => {'specification' => Base64.encode64({
+            'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
+            'mappings' => {'city' => {'properties' => {'population' => {'type' => 'integer'}}}}
+          }.to_json)}
         }])
       end
     end
@@ -88,7 +97,7 @@ describe Chewy::Index::Specification do
     specify do
       expect { specification1.lock! }.to change { specification1.locked }.from({}).to(
         'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-        'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+        'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
       )
     end
 
@@ -105,20 +114,20 @@ describe Chewy::Index::Specification do
       specify do
         expect { specification2.lock! }.to change { specification2.locked }.from(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
         ).to(
           'settings' => {'analyzer' => {}, 'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
         )
       end
 
       specify do
         expect { specification3.lock! }.to change { specification3.locked }.from(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}}
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}}
         ).to(
           'settings' => {'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}},
-          'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}, 'population' => {'type' => 'integer'}}}}
+          'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}, 'population' => {'type' => 'integer'}}}}
         )
       end
     end
@@ -127,7 +136,7 @@ describe Chewy::Index::Specification do
   describe '#current' do
     specify do
       expect(specification2.current).to eq(
-        'mappings' => {'city' => {'properties' => {'name' => {'type' => 'string'}}}},
+        'mappings' => {'city' => {'properties' => {'founded_on' => {'type' => 'date'}}}},
         'settings' => {'analyzer' => {}, 'index' => {'number_of_shards' => 1, 'number_of_replicas' => 0}}
       )
     end

data/spec/chewy/index_spec.rb

@@ -191,16 +191,44 @@ describe Chewy::Index do
       stub_index(:places) do
         def self.by_rating; end
 
-        def self.by_name; end
+        def self.colors(*colors)
+          filter(terms: {colors: colors.flatten(1).map(&:to_s)})
+        end
 
         define_type :city do
           def self.by_id; end
+          field :colors
         end
       end
     end
 
     specify { expect(described_class.scopes).to eq([]) }
-    specify { expect(PlacesIndex.scopes).to match_array(%i[by_rating by_name]) }
+    specify { expect(PlacesIndex.scopes).to match_array(%i[by_rating colors]) }
+
+    context do
+      before do
+        Chewy.massacre
+        PlacesIndex::City.import!(
+          double(colors: ['red']),
+          double(colors: %w[red green]),
+          double(colors: %w[green yellow])
+        )
+      end
+
+      specify do
+        # This `blank?`` call is for the messed scopes bug reproduction. See #573
+        PlacesIndex::City.blank?
+        expect(PlacesIndex.colors(:green).map(&:colors))
+          .to contain_exactly(%w[red green], %w[green yellow])
+      end
+
+      specify do
+        # This `blank?` call is for the messed scopes bug reproduction. See #573
+        PlacesIndex::City.blank?
+        expect(PlacesIndex::City.colors(:green).map(&:colors))
+          .to contain_exactly(%w[red green], %w[green yellow])
+      end
+    end
   end
 
   describe '.settings_hash' do
@@ -216,17 +244,17 @@ describe Chewy::Index do
     specify do
       expect(stub_index(:documents) do
                define_type :document do
-                 field :name, type: 'string'
+                 field :date, type: 'date'
                end
-             end.mappings_hash).to eq(mappings: {document: {properties: {name: {type: 'string'}}}})
+             end.mappings_hash).to eq(mappings: {document: {properties: {date: {type: 'date'}}}})
     end
     specify do
       expect(stub_index(:documents) do
                define_type :document do
-                 field :name, type: 'string'
+                 field :name
                end
                define_type :document2 do
-                 field :name, type: 'string'
+                 field :name
                end
              end.mappings_hash[:mappings].keys).to match_array(%i[document document2])
     end
@@ -240,7 +268,7 @@ describe Chewy::Index do
     specify do
       expect(stub_index(:documents) do
                define_type :document do
-                 field :name, type: 'string'
+                 field :name
                end
              end.specification_hash.keys).to eq([:mappings])
     end
@@ -248,7 +276,7 @@ describe Chewy::Index do
       expect(stub_index(:documents) do
                settings number_of_shards: 1
                define_type :document do
-                 field :name, type: 'string'
+                 field :name
                end
              end.specification_hash.keys).to match_array(%i[mappings settings])
     end
@@ -281,4 +309,29 @@ describe Chewy::Index do
       specify { expect(DummiesIndex.index_name).to eq('borogoves_dummies') }
     end
   end
+
+  context 'index call inside index', :orm do
+    before do
+      stub_index(:cities) do
+        define_type :city do
+          field :country_name, value: (lambda do |city|
+            CountriesIndex::Country.filter(term: {_id: city.country_id}).first.name
+          end)
+        end
+      end
+
+      stub_index(:countries) do
+        define_type :country do
+          field :name
+        end
+      end
+
+      CountriesIndex::Country.import!(double(id: 1, name: 'Country'))
+    end
+
+    specify do
+      expect { CitiesIndex::City.import!(double(country_id: 1)) }
+        .to update_index(CitiesIndex::City).and_reindex(country_name: 'Country')
+    end
+  end
 end

data/spec/chewy/journal_spec.rb

@@ -51,7 +51,7 @@ describe Chewy::Journal do
 
             places_index.import
 
-            expect(Chewy::Stash.exists?).to eq true
+            expect(Chewy::Stash::Journal.exists?).to eq true
 
             Timecop.freeze(update_time)
             cities.first.update_attributes!(name: 'Supername')
@@ -65,63 +65,63 @@ describe Chewy::Journal do
                 'index_name' => "#{namespace}places",
                 'type_name' => 'city',
                 'action' => 'index',
-                'references' => ['1'],
+                'references' => ['1'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
                 'index_name' => "#{namespace}places",
                 'type_name' => 'city',
                 'action' => 'index',
-                'references' => ['2'],
+                'references' => ['2'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
                 'index_name' => "#{namespace}places",
                 'type_name' => 'country',
                 'action' => 'index',
-                'references' => ['1'],
+                'references' => ['1'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
                 'index_name' => "#{namespace}places",
                 'type_name' => 'country',
                 'action' => 'index',
-                'references' => ['2'],
+                'references' => ['2'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
                 'index_name' => "#{namespace}places",
                 'type_name' => 'country',
                 'action' => 'index',
-                'references' => ['3'],
+                'references' => ['3'].map(&Base64.method(:encode64)),
                 'created_at' => time.utc.as_json
               },
               {
                 'index_name' => "#{namespace}places",
                 'type_name' => 'city',
                 'action' => 'index',
-                'references' => %w[1 2],
+                'references' => %w[1 2].map(&Base64.method(:encode64)),
                 'created_at' => import_time.utc.as_json
               },
               {
                 'index_name' => "#{namespace}places",
                 'type_name' => 'country',
                 'action' => 'index',
-                'references' => %w[1 2 3],
+                'references' => %w[1 2 3].map(&Base64.method(:encode64)),
                 'created_at' => import_time.utc.as_json
               },
               {
                 'index_name' => "#{namespace}places",
                 'type_name' => 'city',
                 'action' => 'index',
-                'references' => ['1'],
+                'references' => ['1'].map(&Base64.method(:encode64)),
                 'created_at' => update_time.utc.as_json
               },
               {
                 'index_name' => "#{namespace}places",
                 'type_name' => 'country',
                 'action' => 'delete',
-                'references' => ['2'],
+                'references' => ['2'].map(&Base64.method(:encode64)),
                 'created_at' => destroy_time.utc.as_json
               }
             ]
@@ -231,7 +231,7 @@ describe Chewy::Journal do
           let!(:journal_entries) do
             record = Chewy::Stash::Journal.entries(time).first
             Array.new(count_of_checks) do |i|
-              Chewy::Stash::Journal.new(
+              Chewy::Stash::Journal::Journal.new(
                 record.attributes.merge(
                   'created_at' => time.to_i + i,
                   'references' => [i.to_s]

data/spec/chewy/query/filters_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Chewy::Query::Filters do
-  def Bool(options) # rubocop:disable Style/MethodName
+  def Bool(options) # rubocop:disable Naming/MethodName
     Chewy::Query::Nodes::Bool.new.tap do |bool|
       bool.must(*options[:must]) if options[:must].present?
       bool.must_not(*options[:must_not]) if options[:must_not].present?

data/spec/chewy/query/nodes/not_spec.rb

@@ -9,5 +9,6 @@ describe Chewy::Query::Nodes::Not do
     # rubocop:disable Style/InverseMethods
     specify { expect(render { !(email == 'email') }).to eq(not: {term: {'email' => 'email'}}) }
     specify { expect(render { ~!(email == 'email') }).to eq(not: {filter: {term: {'email' => 'email'}}, _cache: true}) }
+    # rubocop:enable Style/InverseMethods
   end
 end

data/spec/chewy/query_spec.rb

@@ -36,6 +36,7 @@ describe Chewy::Query do
       specify { expect(subject.offset(6).count).to eq(3) }
       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({}).highlight(fields: {name: {}}).first.name_highlight).to eq(nil) }
       specify { expect(subject.query(match: {name: 'name3'}).highlight(fields: {name: {}}).first._data['_source']['name']).to eq('Name3') }
       specify { expect(subject.types(:product).count).to eq(3) }
       specify { expect(subject.types(:product, :country).count).to eq(6) }
@@ -216,7 +217,7 @@ describe Chewy::Query do
             define_type :product do
               root do
                 field :name, 'surname'
-                field :title, type: 'string' do
+                field :title do
                   field :subfield1
                 end
                 field 'price', type: 'float' do
@@ -237,7 +238,7 @@ describe Chewy::Query do
               define_type :product do
                 root do
                   field :name, 'surname'
-                  field :title, type: 'string' do
+                  field :title do
                     field :subfield1
                   end
                   field 'price', type: 'float' do

data/spec/chewy/rake_helper_spec.rb

@@ -23,8 +23,21 @@ describe Chewy::RakeHelper, :orm do
   let!(:countries) { Array.new(2) { |i| Country.create!(name: "Name#{i + 1}") } }
   let(:journal) do
     Chewy::Stash::Journal.import([
-      {index_name: 'places', type_name: 'city', action: 'index', references: cities.first(2).map(&:id).map(&:to_s).map(&:to_json), created_at: 2.minutes.since},
-      {index_name: 'places', type_name: 'country', action: 'index', references: [countries.first.id.to_s.to_json], created_at: 4.minutes.since}
+      {
+        index_name: 'places',
+        type_name: 'city',
+        action: 'index',
+        references: cities.first(2).map(&:id).map(&:to_s)
+                      .map(&:to_json).map(&Base64.method(:encode64)),
+        created_at: 2.minutes.since
+      },
+      {
+        index_name: 'places',
+        type_name: 'country',
+        action: 'index',
+        references: [Base64.encode64(countries.first.id.to_s.to_json)],
+        created_at: 4.minutes.since
+      }
     ])
   end
 
@@ -37,14 +50,14 @@ describe Chewy::RakeHelper, :orm do
         .to update_index(PlacesIndex::City)
       expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AResetting PlacesIndex
-  Imported PlacesIndex::City for \\d+s, stats: index 3
-  Imported PlacesIndex::Country for \\d+s, stats: index 2
+  Imported PlacesIndex::City in \\d+s, stats: index 3
+  Imported PlacesIndex::Country in \\d+s, stats: index 2
   Applying journal to \\[PlacesIndex::City, PlacesIndex::Country\\], 3 entries, stage 1
-  Imported PlacesIndex::City for \\d+s, stats: index 2
-  Imported PlacesIndex::Country for \\d+s, stats: index 1
-  Imported Chewy::Stash::Specification for \\d+s, stats: index 1
+  Imported PlacesIndex::City in \\d+s, stats: index 2
+  Imported PlacesIndex::Country in \\d+s, stats: index 1
+  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
 Resetting UsersIndex
-  Imported Chewy::Stash::Specification for \\d+s, stats: index 1
+  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
 Total: \\d+s\\Z
       OUTPUT
     end
@@ -55,12 +68,12 @@ Total: \\d+s\\Z
         .to update_index(PlacesIndex::City)
       expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AResetting PlacesIndex
-  Imported PlacesIndex::City for \\d+s, stats: index 3
-  Imported PlacesIndex::Country for \\d+s, stats: index 2
+  Imported PlacesIndex::City in \\d+s, stats: index 3
+  Imported PlacesIndex::Country in \\d+s, stats: index 2
   Applying journal to \\[PlacesIndex::City, PlacesIndex::Country\\], 3 entries, stage 1
-  Imported PlacesIndex::City for \\d+s, stats: index 2
-  Imported PlacesIndex::Country for \\d+s, stats: index 1
-  Imported Chewy::Stash::Specification for \\d+s, stats: index 1
+  Imported PlacesIndex::City in \\d+s, stats: index 2
+  Imported PlacesIndex::Country in \\d+s, stats: index 1
+  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
 Total: \\d+s\\Z
       OUTPUT
     end
@@ -71,7 +84,7 @@ Total: \\d+s\\Z
         .not_to update_index(PlacesIndex::City)
       expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AResetting UsersIndex
-  Imported Chewy::Stash::Specification for \\d+s, stats: index 1
+  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
 Total: \\d+s\\Z
       OUTPUT
     end
@@ -84,11 +97,11 @@ Total: \\d+s\\Z
         .to update_index(PlacesIndex::City)
       expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AResetting PlacesIndex
-  Imported PlacesIndex::City for \\d+s, stats: index 3
-  Imported PlacesIndex::Country for \\d+s, stats: index 2
-  Imported Chewy::Stash::Specification for \\d+s, stats: index 1
+  Imported PlacesIndex::City in \\d+s, stats: index 3
+  Imported PlacesIndex::Country in \\d+s, stats: index 2
+  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
 Resetting UsersIndex
-  Imported Chewy::Stash::Specification for \\d+s, stats: index 1
+  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
 Total: \\d+s\\Z
       OUTPUT
     end
@@ -103,7 +116,7 @@ Total: \\d+s\\Z
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\ASkipping PlacesIndex, the specification didn't change
 Resetting UsersIndex
-  Imported Chewy::Stash::Specification for \\d+s, stats: index 1
+  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
 Total: \\d+s\\Z
         OUTPUT
       end
@@ -114,7 +127,7 @@ Total: \\d+s\\Z
           .not_to update_index(PlacesIndex::City)
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AResetting UsersIndex
-  Imported Chewy::Stash::Specification for \\d+s, stats: index 1
+  Imported Chewy::Stash::Specification::Specification in \\d+s, stats: index 1
 Total: \\d+s\\Z
         OUTPUT
       end
@@ -154,8 +167,8 @@ Total: \\d+s\\Z
           .to update_index(PlacesIndex::City)
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AUpdating PlacesIndex
-  Imported PlacesIndex::City for \\d+s, stats: index 3
-  Imported PlacesIndex::Country for \\d+s, stats: index 2
+  Imported PlacesIndex::City in \\d+s, stats: index 3
+  Imported PlacesIndex::Country in \\d+s, stats: index 2
 Total: \\d+s\\Z
         OUTPUT
       end
@@ -166,7 +179,7 @@ Total: \\d+s\\Z
           .not_to update_index(PlacesIndex::City)
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AUpdating PlacesIndex
-  Imported PlacesIndex::Country for \\d+s, stats: index 2
+  Imported PlacesIndex::Country in \\d+s, stats: index 2
 Total: \\d+s\\Z
         OUTPUT
       end
@@ -177,7 +190,7 @@ Total: \\d+s\\Z
           .to update_index(PlacesIndex::City)
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AUpdating PlacesIndex
-  Imported PlacesIndex::City for \\d+s, stats: index 3
+  Imported PlacesIndex::City in \\d+s, stats: index 3
 Total: \\d+s\\Z
         OUTPUT
       end
@@ -191,12 +204,12 @@ Total: \\d+s\\Z
         .to update_index(PlacesIndex::City)
       expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\ASynchronizing PlacesIndex::City
-  Imported PlacesIndex::City for \\d+s, stats: index 3
+  Imported PlacesIndex::City in \\d+s, stats: index 3
   Missing documents: \\[[^\\]]+\\]
   Took \\d+s
 Synchronizing PlacesIndex::Country
   PlacesIndex::Country doesn't support outdated synchronization
-  Imported PlacesIndex::Country for \\d+s, stats: index 2
+  Imported PlacesIndex::Country in \\d+s, stats: index 2
   Missing documents: \\[[^\\]]+\\]
   Took \\d+s
 Total: \\d+s\\Z
@@ -218,7 +231,7 @@ Total: \\d+s\\Z
           .to update_index(PlacesIndex::City)
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\ASynchronizing PlacesIndex::City
-  Imported PlacesIndex::City for \\d+s, stats: index 2
+  Imported PlacesIndex::City in \\d+s, stats: index 2
   Missing documents: \\["#{cities.last.id}"\\]
   Outdated documents: \\["#{cities.first.id}"\\]
   Took \\d+s
@@ -236,7 +249,7 @@ Total: \\d+s\\Z
           .to update_index(PlacesIndex::City)
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\ASynchronizing PlacesIndex::City
-  Imported PlacesIndex::City for \\d+s, stats: index 2
+  Imported PlacesIndex::City in \\d+s, stats: index 2
   Missing documents: \\["#{cities.last.id}"\\]
   Outdated documents: \\["#{cities.first.id}"\\]
   Took \\d+s
@@ -281,8 +294,8 @@ Total: \\d+s\\Z
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AApplying journal entries created after [+-:\\d\\s]+
   Applying journal to \\[PlacesIndex::City, PlacesIndex::Country\\], 3 entries, stage 1
-  Imported PlacesIndex::City for \\d+s, stats: index 2
-  Imported PlacesIndex::Country for \\d+s, stats: index 1
+  Imported PlacesIndex::City in \\d+s, stats: index 2
+  Imported PlacesIndex::Country in \\d+s, stats: index 1
 Total: \\d+s\\Z
         OUTPUT
       end
@@ -294,7 +307,7 @@ Total: \\d+s\\Z
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AApplying journal entries created after [+-:\\d\\s]+
   Applying journal to \\[PlacesIndex::Country\\], 1 entries, stage 1
-  Imported PlacesIndex::Country for \\d+s, stats: index 1
+  Imported PlacesIndex::Country in \\d+s, stats: index 1
 Total: \\d+s\\Z
         OUTPUT
       end
@@ -306,7 +319,7 @@ Total: \\d+s\\Z
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AApplying journal entries created after [+-:\\d\\s]+
   Applying journal to \\[PlacesIndex::City\\], 2 entries, stage 1
-  Imported PlacesIndex::City for \\d+s, stats: index 2
+  Imported PlacesIndex::City in \\d+s, stats: index 2
 Total: \\d+s\\Z
         OUTPUT
       end
@@ -318,7 +331,7 @@ Total: \\d+s\\Z
         expect(output.string).to match(Regexp.new(<<-OUTPUT, Regexp::MULTILINE))
 \\AApplying journal entries created after [+-:\\d\\s]+
   Applying journal to \\[PlacesIndex::Country\\], 1 entries, stage 1
-  Imported PlacesIndex::Country for \\d+s, stats: index 1
+  Imported PlacesIndex::Country in \\d+s, stats: index 1
 Total: \\d+s\\Z
         OUTPUT
       end