Fix no_timeout option handling.

[ #2840 ]

CHANGELOG.md

@@ -9,6 +9,8 @@ For instructions on upgrading to newer versions, visit
 
 * \#2848 Fixed `touch` to work when usinng short timestamps. (Arthur Neves)
 
+* \#2840 Fixed end-to-end `no_timeout` option handling.
+
 ## 3.1.1
 
 ### Resolved Issues

lib/mongoid/contextual/mongo.rb

@@ -466,6 +466,9 @@ def apply_options
         [ :hint, :limit, :skip, :sort, :batch_size, :max_scan ].each do |name|
           apply_option(name)
         end
+        if criteria.options[:timeout] == false
+          query.no_timeout
+        end
       end
 
       # Apply an option.

spec/mongoid/contextual/mongo_spec.rb

@@ -759,7 +759,7 @@
   describe "#initialize" do
 
     let(:criteria) do
-      Band.where(name: "Depeche Mode")
+      Band.where(name: "Depeche Mode").no_timeout
     end
 
     let(:context) do
@@ -781,6 +781,10 @@
     it "sets the query selector" do
       context.query.selector.should eq({ "name" => "Depeche Mode" })
     end
+
+    it "sets timeout options" do
+      context.query.operation.flags.should eq([ :no_cursor_timeout ])
+    end
   end
 
   describe "#last" do