fix

Author: p

lib/mongo/cursor/builder/kill_cursors_command.rb

@@ -68,14 +68,19 @@ class << self
           #   KillCursorsCommand.update_cursors(spec, ids)
           #
           # @return [ Hash ] The specification.
-          # @return [ Array ] The ids to update with.
+          # @return [ Array<Integer> ] The ids to update with.
           #
           # @since 2.3.0
           def update_cursors(spec, ids)
+            # Ruby 2.5+ can & BSON::Int64 instances.
+            # Ruby 2.4 and earlier cannot.
+            # Convert stored ids to Ruby integers for compatibility with
+            # older Rubies.
+            ids = get_cursors_list(spec) & ids
             ids = ids.map do |cursor_id|
               BSON::Int64.new(cursor_id)
             end
-            spec[:selector].merge!(cursors: spec[:selector][:cursors] & ids)
+            spec[:selector].merge!(cursors: ids)
           end
 
           # Get the list of cursor ids from a spec generated by this Builder.

lib/mongo/cursor/builder/op_kill_cursors.rb

@@ -63,14 +63,19 @@ class << self
           #   OpKillCursors.update_cursors(spec, ids)
           #
           # @return [ Hash ] The specification.
-          # @return [ Array ] The ids to update with.
+          # @return [ Array<Integer> ] The ids to update with.
           #
           # @since 2.3.0
           def update_cursors(spec, ids)
+            # Ruby 2.5+ can & BSON::Int64 instances.
+            # Ruby 2.4 and earlier cannot.
+            # Convert stored ids to Ruby integers for compatibility with
+            # older Rubies.
+            ids = get_cursors_list(spec) & ids
             ids = ids.map do |cursor_id|
               BSON::Int64.new(cursor_id)
             end
-            spec.merge!(cursor_ids: spec[:cursor_ids] & ids)
+            spec.merge!(cursor_ids: ids)
           end
 
           # Get the list of cursor ids from a spec generated by this Builder.

spec/mongo/cursor_spec.rb

@@ -318,7 +318,7 @@
         Mongo::Collection::View.new(
             authorized_collection,
             {},
-            :batch_size => 2
+            :batch_size => 2,
         )
       end
 
@@ -329,9 +329,9 @@
 
       it 'schedules a kill cursors op' do
         cluster.instance_variable_get(:@periodic_executor).flush
-        expect {
+        expect do
           cursor.to_a
-        }.to raise_exception(Mongo::Error::OperationFailure, /[cC]ursor.*not found/)
+        end.to raise_exception(Mongo::Error::OperationFailure, /[cC]ursor.*not found/)
       end
 
       context 'when the cursor is unregistered before the kill cursors operations are executed' do