spec/moped/query_spec.rb in mongoid-scroll-0.3.0 vs spec/moped/query_spec.rb in mongoid-scroll-0.3.1

@@ -4,11 +4,11 @@
   context 'scrollable' do
     subject do
       Mongoid.default_session['feed_items'].find
     end
     it ':scroll' do
-      subject.should.respond_to? :scroll
+      expect(subject).to respond_to(:scroll)
     end
   end
   context 'with multiple sort fields' do
     subject do
       Mongoid.default_session['feed_items'].find.sort(name: 1, value: -1)
@@ -21,20 +21,20 @@
   context 'with no sort' do
     subject do
       Mongoid.default_session['feed_items'].find
     end
     it 'adds a default sort by _id' do
-      subject.scroll.operation.selector['$orderby'].should == { _id: 1 }
+      expect(subject.scroll.operation.selector['$orderby']).to eq(_id: 1)
     end
   end
   context 'with data' do
     before :each do
       10.times do |i|
         Mongoid.default_session['feed_items'].insert(
           a_string: i.to_s,
           a_integer: i,
-          a_datetime: DateTime.mongoize(DateTime.new(2013, i + 1, 21, 1, 42, 3)),
+          a_datetime: DateTime.mongoize(DateTime.new(2013, i + 1, 21, 1, 42, 3, 'UTC')),
           a_date: Date.mongoize(Date.new(2013, i + 1, 21)),
           a_time: Time.mongoize(Time.at(Time.now.to_i + i))
         )
       end
     end
@@ -42,54 +42,52 @@
       it 'scrolls all' do
         records = []
         Mongoid.default_session['feed_items'].find.scroll do |record, _next_cursor|
           records << record
         end
-        records.size.should == 10
-        records.should eq Mongoid.default_session['feed_items'].find.to_a
+        expect(records.size).to eq 10
+        expect(records).to eq Mongoid.default_session['feed_items'].find.to_a
       end
     end
     { a_string: String, a_integer: Integer, a_date: Date, a_datetime: DateTime }.each_pair do |field_name, field_type|
       context field_type do
         it 'scrolls all with a block' do
           records = []
-          Mongoid.default_session['feed_items'].find.sort(field_name => 1).scroll(nil,  field_type: field_type) do |record, _next_cursor|
+          Mongoid.default_session['feed_items'].find.sort(field_name => 1).scroll(nil, field_type: field_type) do |record, _next_cursor|
             records << record
           end
-          records.size.should == 10
-          records.should eq Mongoid.default_session['feed_items'].find.to_a
+          expect(records.size).to eq 10
+          expect(records).to eq Mongoid.default_session['feed_items'].find.to_a
         end
         it 'scrolls all with a break' do
           records = []
           cursor = nil
-          Mongoid.default_session['feed_items'].find.sort(field_name => 1).limit(5).scroll(nil,  field_type: field_type) do |record, next_cursor|
+          Mongoid.default_session['feed_items'].find.sort(field_name => 1).limit(5).scroll(nil, field_type: field_type) do |record, next_cursor|
             records << record
             cursor = next_cursor
           end
-          records.size.should == 5
-          Mongoid.default_session['feed_items'].find.sort(field_name => 1).scroll(cursor,  field_type: field_type) do |record, next_cursor|
+          expect(records.size).to eq 5
+          Mongoid.default_session['feed_items'].find.sort(field_name => 1).scroll(cursor, field_type: field_type) do |record, next_cursor|
             records << record
             cursor = next_cursor
           end
-          records.size.should == 10
-          records.should eq Mongoid.default_session['feed_items'].find.to_a
+          expect(records.size).to eq 10
+          expect(records).to eq Mongoid.default_session['feed_items'].find.to_a
         end
         it 'scrolls in descending order' do
           records = []
-          Mongoid.default_session['feed_items'].find.sort(field_name => -1).limit(3).scroll(nil,  field_type: field_type, field_name: field_name) do |record, _next_cursor|
+          Mongoid.default_session['feed_items'].find.sort(field_name => -1).limit(3).scroll(nil, field_type: field_type, field_name: field_name) do |record, _next_cursor|
             records << record
           end
-          records.size.should == 3
-          records.should eq Mongoid.default_session['feed_items'].find.sort(field_name => -1).limit(3).to_a
+          expect(records.size).to eq 3
+          expect(records).to eq Mongoid.default_session['feed_items'].find.sort(field_name => -1).limit(3).to_a
         end
         it 'map' do
-          record = Mongoid.default_session['feed_items'].find.limit(3).scroll(nil,  field_type: field_type, field_name: field_name).map {
-            |r, _| r
-          }.last
-          cursor = Mongoid::Scroll::Cursor.from_record(record,  field_type: field_type, field_name: field_name)
-          cursor.should_not be_nil
-          cursor.to_s.split(':').should == [
+          record = Mongoid.default_session['feed_items'].find.limit(3).scroll(nil, field_type: field_type, field_name: field_name).map { |r| r }.last
+          cursor = Mongoid::Scroll::Cursor.from_record(record, field_type: field_type, field_name: field_name)
+          expect(cursor).to_not be nil
+          expect(cursor.to_s.split(':')).to eq [
             Mongoid::Scroll::Cursor.transform_field_value(field_type, field_name, record[field_name.to_s]).to_s,
             record['_id'].to_s
           ]
         end
       end
@@ -102,25 +100,25 @@
     end
     it 'natural order is different from order by id' do
       # natural order isn't necessarily going to be the same as _id order
       # if a document is updated and grows in size, it may need to be relocated and
       # thus cause the natural order to change
-      Feed::Item.order_by('$natural' => 1).to_a.should_not eq Feed::Item.order_by(_id: 1).to_a
+      expect(Feed::Item.order_by('$natural' => 1).to_a).to_not eq Feed::Item.order_by(_id: 1).to_a
     end
     [{ a_integer: 1 }, { a_integer: -1 }].each do |sort_order|
       it "scrolls by #{sort_order}" do
         records = []
         cursor = nil
         Mongoid.default_session['feed_items'].find.sort(sort_order).limit(2).scroll do |record, next_cursor|
           records << record
           cursor = next_cursor
         end
-        records.size.should == 2
+        expect(records.size).to eq 2
         Mongoid.default_session['feed_items'].find.sort(sort_order).scroll(cursor) do |record, _next_cursor|
           records << record
         end
-        records.size.should == 3
-        records.should eq Mongoid.default_session['feed_items'].find.sort(_id: sort_order[:a_integer]).to_a
+        expect(records.size).to eq 3
+        expect(records).to eq Mongoid.default_session['feed_items'].find.sort(_id: sort_order[:a_integer]).to_a
       end
     end
   end
-end
+end if Object.const_defined?(:Moped)