chewy 0.8.4 → 0.9.0

data/spec/chewy/type/adapter/sequel_spec.rb

@@ -7,24 +7,24 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
   end
 
   describe '#name' do
-    it { expect( described_class.new(City).name ).to eq 'City' }
-    it { expect( described_class.new(City.order(:id)).name ).to eq 'City' }
-    it { expect( described_class.new(City, name: 'town').name ).to eq 'Town' }
+    it { expect(described_class.new(City).name).to eq 'City' }
+    it { expect(described_class.new(City.order(:id)).name).to eq 'City' }
+    it { expect(described_class.new(City, name: 'town').name).to eq 'Town' }
 
     context do
       before { stub_model('namespace/city') }
 
-      it { expect( described_class.new(Namespace::City).name ).to eq 'City' }
-      it { expect( described_class.new(Namespace::City.order(:id)).name ).to eq 'City' }
+      it { expect(described_class.new(Namespace::City).name).to eq 'City' }
+      it { expect(described_class.new(Namespace::City.order(:id)).name).to eq 'City' }
     end
   end
 
   describe '#default_scope' do
-    it { expect( described_class.new(City).default_scope.sql ).to eql City.where(nil).sql }
-    it { expect( described_class.new(City.order(:id)).default_scope.sql ).to eql City.where(nil).sql }
-    it { expect( described_class.new(City.limit(10)).default_scope.sql ).to eql City.where(nil).sql  }
-    it { expect( described_class.new(City.offset(10)).default_scope.sql ).to eql City.where(nil).sql }
-    it { expect( described_class.new(City.where(rating: 10)).default_scope.sql ).to eql City.where(rating: 10).sql }
+    it { expect(described_class.new(City).default_scope.sql).to eql City.where(nil).sql }
+    it { expect(described_class.new(City.order(:id)).default_scope.sql).to eql City.where(nil).sql }
+    it { expect(described_class.new(City.limit(10)).default_scope.sql).to eql City.where(nil).sql  }
+    it { expect(described_class.new(City.offset(10)).default_scope.sql).to eql City.where(nil).sql }
+    it { expect(described_class.new(City.where(rating: 10)).default_scope.sql).to eql City.where(rating: 10).sql }
   end
 
   describe '#type_name' do
@@ -44,17 +44,17 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
     subject { described_class.new(City) }
 
     context do
-      let!(:cities) { 3.times.map { City.new.save! } }
+      let!(:cities) { Array.new(3) { City.new.save! } }
 
-      it { expect(subject.identify(City.where(nil)) ).to match_array cities.map(&:id) }
-      it { expect(subject.identify(cities) ).to eq cities.map(&:id) }
-      it { expect(subject.identify(cities.first) ).to eq([cities.first.id]) }
-      it { expect(subject.identify(cities.first(2).map(&:id)) ).to eq cities.first(2).map(&:id) }
+      it { expect(subject.identify(City.where(nil))).to match_array cities.map(&:id) }
+      it { expect(subject.identify(cities)).to eq cities.map(&:id) }
+      it { expect(subject.identify(cities.first)).to eq([cities.first.id]) }
+      it { expect(subject.identify(cities.first(2).map(&:id))).to eq cities.first(2).map(&:id) }
     end
 
     context 'custom primary_key' do
       before { stub_model(:city).set_dataset :rating_cities }
-      let!(:cities) { 3.times.map { |i| City.create! { |c| c.rating = i } } }
+      let!(:cities) { Array.new(3) { |i| City.create! { |c| c.rating = i } } }
 
       specify { expect(subject.identify(City.where(nil))).to match_array([0, 1, 2]) }
       specify { expect(subject.identify(cities)).to eq([0, 1, 2]) }
@@ -71,46 +71,62 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
     end
 
     context do
-      let!(:cities) { 3.times.map { City.create! } }
-      let!(:deleted) { 4.times.map { City.create!.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { City.create! } }
+      let!(:deleted) { Array.new(4) { City.create!.tap(&:destroy) } }
       subject { described_class.new(City) }
 
-      specify { expect(import).to eq([{index: cities}]) }
-      specify { expect(import nil).to eq([]) }
-
-      specify { expect(import(City.order(:id))).to eq([{index: cities}]) }
-      specify { expect(import(City.order(:id), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-
-      specify { expect(import(cities)).to eq([{index: cities}]) }
-      specify { expect(import(cities, batch_size: 2))
-          .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-      specify { expect(import(cities, deleted))
-        .to eq([{index: cities}, {delete: deleted}]) }
-      specify { expect(import(cities, deleted, batch_size: 2)).to eq([
-        {index: cities.first(2)},
-        {index: cities.last(1)},
-        {delete: deleted.first(2)},
-        {delete: deleted.last(2)}]) }
-
-      specify { expect(import(cities.map(&:id))).to eq([{index: cities}]) }
-      specify { expect(import(deleted.map(&:id))).to eq([{delete: deleted.map(&:id)}]) }
-      specify { expect(import(cities.map(&:id), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id)))
-        .to eq([{index: cities}, {delete: deleted.map(&:id)}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 2)).to eq([
-        {index: cities.first(2)},
-        {index: cities.last(1)},
-        {delete: deleted.first(2).map(&:id)},
-        {delete: deleted.last(2).map(&:id)}]) }
-
-      specify { expect(import(cities.first, nil)).to eq([{index: [cities.first]}]) }
-      specify { expect(import(cities.first.id, nil)).to eq([{index: [cities.first]}]) }
+      specify { expect(import).to eq([{ index: cities }]) }
+      specify { expect(import(nil)).to eq([]) }
+
+      specify { expect(import(City.order(:id))).to eq([{ index: cities }]) }
+      specify do
+        expect(import(City.order(:id), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+
+      specify { expect(import(cities)).to eq([{ index: cities }]) }
+      specify do
+        expect(import(cities, batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities, deleted))
+          .to eq([{ index: cities }, { delete: deleted }])
+      end
+      specify do
+        expect(import(cities, deleted, batch_size: 2)).to eq([
+          { index: cities.first(2) },
+          { index: cities.last(1) },
+          { delete: deleted.first(2) },
+          { delete: deleted.last(2) }
+        ])
+      end
+
+      specify { expect(import(cities.map(&:id))).to eq([{ index: cities }]) }
+      specify { expect(import(deleted.map(&:id))).to eq([{ delete: deleted.map(&:id) }]) }
+      specify do
+        expect(import(cities.map(&:id), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id)))
+          .to eq([{ index: cities }, { delete: deleted.map(&:id) }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 2)).to eq([
+          { index: cities.first(2) },
+          { index: cities.last(1) },
+          { delete: deleted.first(2).map(&:id) },
+          { delete: deleted.last(2).map(&:id) }
+        ])
+      end
+
+      specify { expect(import(cities.first, nil)).to eq([{ index: [cities.first] }]) }
+      specify { expect(import(cities.first.id, nil)).to eq([{ index: [cities.first] }]) }
     end
 
-    context 'additional delete conitions' do
-      let!(:cities) { 4.times.map { |i| City.create! rating: i } }
+    context 'additional delete conditions' do
+      let!(:cities) { Array.new(4) { |i| City.create! rating: i } }
       before { cities.last(2).map(&:destroy) }
       subject { described_class.new(City) }
 
@@ -121,111 +137,164 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
           end
         end
       end
-      subject { described_class.new(City, delete_if: ->{ delete_already? }) }
-
-      specify { expect(import(City.where(nil))).to eq([
-        { index: [cities[0]], delete: [cities[1]] }
-      ]) }
-      specify { expect(import(cities)).to eq([
-        { index: [cities[0]], delete: [cities[1]] },
-        { delete: cities.last(2) }
-      ]) }
-      specify { expect(import(cities.map(&:id))).to eq([
-        { index: [cities[0]], delete: [cities[1]] },
-        { delete: cities.last(2).map(&:id) }
-      ]) }
+      subject { described_class.new(City, delete_if: -> { delete_already? }) }
+
+      specify do
+        expect(import(City.where(nil))).to eq([
+          { index: [cities[0]], delete: [cities[1]] }
+        ])
+      end
+      specify do
+        expect(import(cities)).to eq([
+          { index: [cities[0]], delete: [cities[1]] },
+          { delete: cities.last(2) }
+        ])
+      end
+      specify do
+        expect(import(cities.map(&:id))).to eq([
+          { index: [cities[0]], delete: [cities[1]] },
+          { delete: cities.last(2).map(&:id) }
+        ])
+      end
     end
 
     context 'custom primary_key' do
       before { stub_model(:city).set_dataset :rating_cities }
-      let!(:cities) { 3.times.map { |i| City.create! { |c| c.rating = i + 7 } } }
-      let!(:deleted) { 3.times.map { |i| City.create! { |c| c.rating = i + 10 }.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { |i| City.create! { |c| c.rating = i + 7 } } }
+      let!(:deleted) { Array.new(3) { |i| City.create! { |c| c.rating = i + 10 }.tap(&:destroy) } }
       subject { described_class.new(City) }
 
-      specify { expect(import).to eq([{index: cities}]) }
-
-      specify { expect(import(City.order(:rating))).to eq([{index: cities}]) }
-      specify { expect(import(City.order(:rating), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-
-      specify { expect(import(cities)).to eq([{index: cities}]) }
-      specify { expect(import(cities, batch_size: 2))
-          .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-      specify { expect(import(cities, deleted))
-        .to eq([{index: cities}, {delete: deleted}]) }
-      specify { expect(import(cities, deleted, batch_size: 2)).to eq([
-        {index: cities.first(2)},
-        {index: cities.last(1)},
-        {delete: deleted.first(2)},
-        {delete: deleted.last(1)}]) }
-
-      specify { expect(import(cities.map(&:rating))).to eq([{index: cities}]) }
-      specify { expect(import(cities.map(&:rating), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: cities.last(1)}]) }
-      specify { expect(import(cities.map(&:rating), deleted.map(&:rating)))
-        .to eq([{index: cities}, {delete: deleted.map(&:rating)}]) }
-      specify { expect(import(cities.map(&:rating), deleted.map(&:rating), batch_size: 2)).to eq([
-        {index: cities.first(2)},
-        {index: cities.last(1)},
-        {delete: deleted.first(2).map(&:rating)},
-        {delete: deleted.last(1).map(&:rating)}]) }
+      specify { expect(import).to eq([{ index: cities }]) }
+
+      specify { expect(import(City.order(:rating))).to eq([{ index: cities }]) }
+      specify do
+        expect(import(City.order(:rating), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+
+      specify { expect(import(cities)).to eq([{ index: cities }]) }
+      specify do
+        expect(import(cities, batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities, deleted))
+          .to eq([{ index: cities }, { delete: deleted }])
+      end
+      specify do
+        expect(import(cities, deleted, batch_size: 2)).to eq([
+          { index: cities.first(2) },
+          { index: cities.last(1) },
+          { delete: deleted.first(2) },
+          { delete: deleted.last(1) }
+        ])
+      end
+
+      specify { expect(import(cities.map(&:rating))).to eq([{ index: cities }]) }
+      specify do
+        expect(import(cities.map(&:rating), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities.map(&:rating), deleted.map(&:rating)))
+          .to eq([{ index: cities }, { delete: deleted.map(&:rating) }])
+      end
+      specify do
+        expect(import(cities.map(&:rating), deleted.map(&:rating), batch_size: 2)).to eq([
+          { index: cities.first(2) },
+          { index: cities.last(1) },
+          { delete: deleted.first(2).map(&:rating) },
+          { delete: deleted.last(1).map(&:rating) }
+        ])
+      end
     end
 
     context 'default scope' do
-      let!(:cities) { 4.times.map { |i| City.create!(rating: i/3) } }
-      let!(:deleted) { 3.times.map { |i| City.create!.tap(&:destroy) } }
+      let!(:cities) { Array.new(4) { |i| City.create!(rating: i / 3) } }
+      let!(:deleted) { Array.new(3) { City.create!.tap(&:destroy) } }
       subject { described_class.new(City.where(rating: 0)) }
 
-      specify { expect(import).to eq([{index: cities.first(3)}]) }
+      specify { expect(import).to eq([{ index: cities.first(3) }]) }
 
-      specify { expect(import(City.where('rating < 2')))
-        .to eq([{index: cities.first(3)}]) }
-      specify { expect(import(City.where('rating < 2'), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: [cities[2]]}]) }
-      specify { expect(import(City.where('rating < 1')))
-        .to eq([{index: cities.first(3)}]) }
+      specify do
+        expect(import(City.where('rating < 2')))
+          .to eq([{ index: cities.first(3) }])
+      end
+      specify do
+        expect(import(City.where('rating < 2'), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: [cities[2]] }])
+      end
+      specify do
+        expect(import(City.where('rating < 1')))
+          .to eq([{ index: cities.first(3) }])
+      end
       specify { expect(import(City.where('rating > 1'))).to eq([]) }
 
-      specify { expect(import(cities.first(2)))
-        .to eq([{index: cities.first(2)}]) }
-      specify { expect(import(cities))
-        .to eq([{index: cities.first(3)}, {delete: cities.last(1)}]) }
-      specify { expect(import(cities, batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: [cities[2]]}, {delete: cities.last(1)}]) }
-      specify { expect(import(cities, deleted))
-        .to eq([{index: cities.first(3)}, {delete: cities.last(1) + deleted}]) }
-      specify { expect(import(cities, deleted, batch_size: 3)).to eq([
-        {index: cities.first(3)},
-        {delete: cities.last(1) + deleted.first(2)},
-        {delete: deleted.last(1)}]) }
-
-      specify { expect(import(cities.first(2).map(&:id)))
-        .to eq([{index: cities.first(2)}]) }
-      specify { expect(import(cities.map(&:id)))
-        .to eq([{index: cities.first(3)}, {delete: [cities.last.id]}]) }
-      specify { expect(import(cities.map(&:id), batch_size: 2))
-        .to eq([{index: cities.first(2)}, {index: [cities[2]]}, {delete: [cities.last.id]}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id)))
-        .to eq([{index: cities.first(3)}, {delete: [cities.last.id] + deleted.map(&:id)}]) }
-      specify { expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 3)).to eq([
-        {index: cities.first(3)},
-        {delete: [cities.last.id] + deleted.first(2).map(&:id)},
-        {delete: deleted.last(1).map(&:id)}]) }
+      specify do
+        expect(import(cities.first(2)))
+          .to eq([{ index: cities.first(2) }])
+      end
+      specify do
+        expect(import(cities))
+          .to eq([{ index: cities.first(3) }, { delete: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities, batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: [cities[2]] }, { delete: cities.last(1) }])
+      end
+      specify do
+        expect(import(cities, deleted))
+          .to eq([{ index: cities.first(3) }, { delete: cities.last(1) + deleted }])
+      end
+      specify do
+        expect(import(cities, deleted, batch_size: 3)).to eq([
+          { index: cities.first(3) },
+          { delete: cities.last(1) + deleted.first(2) },
+          { delete: deleted.last(1) }
+        ])
+      end
+
+      specify do
+        expect(import(cities.first(2).map(&:id)))
+          .to eq([{ index: cities.first(2) }])
+      end
+      specify do
+        expect(import(cities.map(&:id)))
+          .to eq([{ index: cities.first(3) }, { delete: [cities.last.id] }])
+      end
+      specify do
+        expect(import(cities.map(&:id), batch_size: 2))
+          .to eq([{ index: cities.first(2) }, { index: [cities[2]] }, { delete: [cities.last.id] }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id)))
+          .to eq([{ index: cities.first(3) }, { delete: [cities.last.id] + deleted.map(&:id) }])
+      end
+      specify do
+        expect(import(cities.map(&:id), deleted.map(&:id), batch_size: 3)).to eq([
+          { index: cities.first(3) },
+          { delete: [cities.last.id] + deleted.first(2).map(&:id) },
+          { delete: deleted.last(1).map(&:id) }
+        ])
+      end
     end
 
     context 'error handling' do
-      let!(:cities) { 3.times.map { |i| City.create! } }
-      let!(:deleted) { 2.times.map { |i| City.create!.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { City.create! } }
+      let!(:deleted) { Array.new(2) { City.create!.tap(&:destroy) } }
       let(:ids) { (cities + deleted).map(&:id) }
       subject { described_class.new(City) }
 
       let(:data_comparer) do
-        ->(id, data) { objects = data[:index] || data[:delete]; !objects.map { |o| o.respond_to?(:id) ? o.id : o }.include?(id) }
+        lambda do |id, data|
+          objects = data[:index] || data[:delete]
+          !objects.map { |o| o.respond_to?(:id) ? o.id : o }.include?(id)
+        end
       end
 
       context 'implicit scope' do
-        specify { expect(subject.import { |data| true }).to eq(true) }
-        specify { expect(subject.import { |data| false }).to eq(false) }
+        specify { expect(subject.import { |_data| true }).to eq(true) }
+        specify { expect(subject.import { |_data| false }).to eq(false) }
         specify { expect(subject.import(batch_size: 1, &data_comparer.curry[cities[0].id])).to eq(false) }
         specify { expect(subject.import(batch_size: 1, &data_comparer.curry[cities[1].id])).to eq(false) }
         specify { expect(subject.import(batch_size: 1, &data_comparer.curry[cities[2].id])).to eq(false) }
@@ -236,8 +305,8 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
       context 'explicit scope' do
         let(:scope) { City.where(id: ids) }
 
-        specify { expect(subject.import(scope) { |data| true }).to eq(true) }
-        specify { expect(subject.import(scope) { |data| false }).to eq(false) }
+        specify { expect(subject.import(scope) { |_data| true }).to eq(true) }
+        specify { expect(subject.import(scope) { |_data| false }).to eq(false) }
         specify { expect(subject.import(scope, batch_size: 1, &data_comparer.curry[cities[0].id])).to eq(false) }
         specify { expect(subject.import(scope, batch_size: 1, &data_comparer.curry[cities[1].id])).to eq(false) }
         specify { expect(subject.import(scope, batch_size: 1, &data_comparer.curry[cities[2].id])).to eq(false) }
@@ -246,8 +315,8 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
       end
 
       context 'objects' do
-        specify { expect(subject.import(cities + deleted) { |data| true }).to eq(true) }
-        specify { expect(subject.import(cities + deleted) { |data| false }).to eq(false) }
+        specify { expect(subject.import(cities + deleted) { |_data| true }).to eq(true) }
+        specify { expect(subject.import(cities + deleted) { |_data| false }).to eq(false) }
         specify { expect(subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[0].id])).to eq(false) }
         specify { expect(subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[1].id])).to eq(false) }
         specify { expect(subject.import(cities + deleted, batch_size: 1, &data_comparer.curry[cities[2].id])).to eq(false) }
@@ -256,8 +325,8 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
       end
 
       context 'ids' do
-        specify { expect(subject.import(ids) { |data| true }).to eq(true) }
-        specify { expect(subject.import(ids) { |data| false }).to eq(false) }
+        specify { expect(subject.import(ids) { |_data| true }).to eq(true) }
+        specify { expect(subject.import(ids) { |_data| false }).to eq(false) }
         specify { expect(subject.import(ids, batch_size: 1, &data_comparer.curry[cities[0].id])).to eq(false) }
         specify { expect(subject.import(ids, batch_size: 1, &data_comparer.curry[cities[1].id])).to eq(false) }
         specify { expect(subject.import(ids, batch_size: 1, &data_comparer.curry[cities[2].id])).to eq(false) }
@@ -269,8 +338,8 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
 
   describe '#load' do
     context do
-      let!(:cities) { 3.times.map { |i| City.create!(rating: i/2) } }
-      let!(:deleted) { 2.times.map { |i| City.create!.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { |i| City.create!(rating: i / 2) } }
+      let!(:deleted) { Array.new(2) { City.create!.tap(&:destroy) } }
 
       let(:type) { double(type_name: 'user') }
 
@@ -280,22 +349,30 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
       specify { expect(subject.load(cities.map { |c| double(id: c.id) }.reverse, _type: type)).to eq(cities.reverse) }
       specify { expect(subject.load(deleted.map { |c| double(id: c.id) }, _type: type)).to eq([nil, nil]) }
       specify { expect(subject.load((cities + deleted).map { |c| double(id: c.id) }, _type: type)).to eq([*cities, nil, nil]) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: ->{ where(rating: 0) }))
-        .to eq(cities.first(2) + [nil]) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) },
-        _type: type, scope: ->{ where(rating: 0) }, user: {scope: ->{ where(rating: 1)}}))
-        .to eq([nil, nil] + cities.last(1)) }
-      xspecify { expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: City.where(rating: 1)))
-        .to eq([nil, nil] + cities.last(1)) }
-      specify { expect(subject.load(cities.map { |c| double(id: c.id) },
-        _type: type, scope: City.where(rating: 1), user: {scope: ->{ where(rating: 0)}}))
-        .to eq(cities.first(2) + [nil]) }
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: -> { where(rating: 0) }))
+          .to eq(cities.first(2) + [nil])
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) },
+          _type: type, scope: -> { where(rating: 0) }, user: { scope: -> { where(rating: 1) } }))
+          .to eq([nil, nil] + cities.last(1))
+      end
+      xspecify do
+        expect(subject.load(cities.map { |c| double(id: c.id) }, _type: type, scope: City.where(rating: 1)))
+          .to eq([nil, nil] + cities.last(1))
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(id: c.id) },
+          _type: type, scope: City.where(rating: 1), user: { scope: -> { where(rating: 0) } }))
+          .to eq(cities.first(2) + [nil])
+      end
     end
 
     context 'custom primary_key' do
       before { stub_model(:city).set_dataset :rating_cities }
-      let!(:cities) { 3.times.map { |i| City.create!(country_id: i/2) { |c| c.rating = i + 7 } } }
-      let!(:deleted) { 2.times.map { |i| City.create! { |c| c.rating = i + 10 }.tap(&:destroy) } }
+      let!(:cities) { Array.new(3) { |i| City.create!(country_id: i / 2) { |c| c.rating = i + 7 } } }
+      let!(:deleted) { Array.new(2) { |i| City.create! { |c| c.rating = i + 10 }.tap(&:destroy) } }
 
       let(:type) { double(type_name: 'user') }
 
@@ -305,16 +382,24 @@ describe Chewy::Type::Adapter::Sequel, :sequel do
       specify { expect(subject.load(cities.map { |c| double(rating: c.rating) }.reverse, _type: type)).to eq(cities.reverse) }
       specify { expect(subject.load(deleted.map { |c| double(rating: c.rating) }, _type: type)).to eq([nil, nil]) }
       specify { expect(subject.load((cities + deleted).map { |c| double(rating: c.rating) }, _type: type)).to eq([*cities, nil, nil]) }
-      specify { expect(subject.load(cities.map { |c| double(rating: c.rating) }, _type: type, scope: ->{ where(country_id: 0) }))
-        .to eq(cities.first(2) + [nil]) }
-      specify { expect(subject.load(cities.map { |c| double(rating: c.rating) },
-        _type: type, scope: ->{ where(country_id: 0) }, user: {scope: ->{ where(country_id: 1)}}))
-        .to eq([nil, nil] + cities.last(1)) }
-      xspecify { expect(subject.load(cities.map { |c| double(rating: c.rating) }, _type: type, scope: City.where(country_id: 1)))
-        .to eq([nil, nil] + cities.last(1)) }
-      specify { expect(subject.load(cities.map { |c| double(rating: c.rating) },
-        _type: type, scope: City.where(country_id: 1), user: {scope: ->{ where(country_id: 0)}}))
-        .to eq(cities.first(2) + [nil]) }
+      specify do
+        expect(subject.load(cities.map { |c| double(rating: c.rating) }, _type: type, scope: -> { where(country_id: 0) }))
+          .to eq(cities.first(2) + [nil])
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(rating: c.rating) },
+          _type: type, scope: -> { where(country_id: 0) }, user: { scope: -> { where(country_id: 1) } }))
+          .to eq([nil, nil] + cities.last(1))
+      end
+      xspecify do
+        expect(subject.load(cities.map { |c| double(rating: c.rating) }, _type: type, scope: City.where(country_id: 1)))
+          .to eq([nil, nil] + cities.last(1))
+      end
+      specify do
+        expect(subject.load(cities.map { |c| double(rating: c.rating) },
+          _type: type, scope: City.where(country_id: 1), user: { scope: -> { where(country_id: 0) } }))
+          .to eq(cities.first(2) + [nil])
+      end
     end
   end
 end