mongoid 7.0.6 → 7.1.2

data/spec/mongoid/contextual/geo_near_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::GeoNear do

data/spec/mongoid/contextual/map_reduce_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::MapReduce do
@@ -75,6 +78,7 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#counts" do
+    max_server_version '4.2'
 
     let(:criteria) do
       Band.all
@@ -103,7 +107,8 @@ describe Mongoid::Contextual::MapReduce do
       end
 
       it "iterates over the results" do
-        expect(results.entries).to eq([
+        ordered_results = results.entries.sort_by { |doc| doc['_id'] }
+        expect(ordered_results.entries).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
           { "_id" => "Tool", "value" => { "likes" => 100 }}
         ])
@@ -124,7 +129,8 @@ describe Mongoid::Contextual::MapReduce do
       end
 
       it "iterates over the results" do
-        expect(results.entries).to eq(expected_results)
+        ordered_results = results.entries.sort_by { |doc| doc['_id'] }
+        expect(ordered_results).to eq(expected_results)
       end
 
       it 'outputs to the collection' do
@@ -144,6 +150,7 @@ describe Mongoid::Contextual::MapReduce do
       end
 
       context "when the statstics are requested" do
+        max_server_version '4.2'
 
         it "raises an error" do
           expect {
@@ -188,14 +195,16 @@ describe Mongoid::Contextual::MapReduce do
         Band.where(name: 'DEPECHE MODE').collation(locale: 'en_US', strength: 2)
       end
 
-      context 'when the server supports collations', if: collation_supported? do
+      context 'when the server supports collations' do
+        min_server_version '3.4'
 
         it 'applies the collation' do
           expect(map_reduce.out(inline: 1).count).to eq(1)
         end
       end
 
-      context 'when the server does not support collations', unless: collation_supported? do
+      context 'when the server does not support collations' do
+        max_server_version '3.2'
 
         it 'raises an exception' do
           expect {
@@ -207,6 +216,7 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#emitted" do
+    max_server_version '4.2'
 
     let(:emitted) do
       map_reduce.out(inline: 1).emitted
@@ -258,6 +268,7 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#input" do
+    max_server_version '4.2'
 
     let(:input) do
       map_reduce.out(inline: 1).input
@@ -308,6 +319,7 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#output" do
+    max_server_version '4.2'
 
     let(:output) do
       map_reduce.out(inline: 1).output
@@ -340,12 +352,16 @@ describe Mongoid::Contextual::MapReduce do
       end
 
       context 'when a read preference is defined' do
+        require_topology :replica_set
+        # On 4.4 it seems the server inserts on the primary, not on the server
+        # that executed the map/reduce.
+        max_server_version '4.2'
 
         let(:criteria) do
           Band.all.read(mode: :secondary)
         end
 
-        it "uses the read preference", if: testing_replica_set? do
+        it "uses the read preference" do
 
           expect {
             replace_map_reduce.raw
@@ -356,6 +372,7 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#reduced" do
+    max_server_version '4.2'
 
     let(:reduced) do
       map_reduce.out(inline: 1).reduced
@@ -386,6 +403,7 @@ describe Mongoid::Contextual::MapReduce do
   end
 
   describe "#time" do
+    max_server_version '4.2'
 
     let(:time) do
       map_reduce.out(inline: 1).time

data/spec/mongoid/contextual/memory_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::Memory do

data/spec/mongoid/contextual/mongo_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::Mongo do
@@ -168,7 +171,8 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context 'when a collation is specified', if: collation_supported? do
+    context 'when a collation is specified' do
+      min_server_version '3.4'
 
       let(:context) do
         described_class.new(criteria)
@@ -229,7 +233,8 @@ describe Mongoid::Contextual::Mongo do
           expect(deleted).to eq(1)
         end
 
-        context 'when the criteria has a collation', if: collation_supported? do
+        context 'when the criteria has a collation' do
+          min_server_version '3.4'
 
           let(:criteria) do
             Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -333,7 +338,8 @@ describe Mongoid::Contextual::Mongo do
           expect(destroyed).to eq(1)
         end
 
-        context 'when the criteria has a collation', if: collation_supported? do
+        context 'when the criteria has a collation' do
+          min_server_version '3.4'
 
           let(:criteria) do
             Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -455,7 +461,8 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context 'when a collation is specified', if: collation_supported? do
+    context 'when a collation is specified' do
+      min_server_version '3.4'
 
       before do
         Band.create(name: 'DEPECHE MODE')
@@ -493,7 +500,8 @@ describe Mongoid::Contextual::Mongo do
       described_class.new(criteria)
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let(:criteria) do
         Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -850,7 +858,8 @@ describe Mongoid::Contextual::Mongo do
         end
       end
 
-      context 'when a collation is specified on the criteria', if: collation_supported? do
+      context 'when a collation is specified on the criteria' do
+        min_server_version '3.4'
 
         let(:criteria) do
           Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -1003,7 +1012,8 @@ describe Mongoid::Contextual::Mongo do
         end
       end
 
-      context 'when a collation is specified on the criteria', if: collation_supported? do
+      context 'when a collation is specified on the criteria' do
+        min_server_version '3.4'
 
         let(:criteria) do
           Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -1077,7 +1087,8 @@ describe Mongoid::Contextual::Mongo do
         }.to raise_error(Mongoid::Errors::DocumentNotFound)
       end
 
-      context 'when a collation is specified on the criteria', if: collation_supported? do
+      context 'when a collation is specified on the criteria' do
+        min_server_version '3.4'
 
         let(:criteria) do
           Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -1149,7 +1160,8 @@ describe Mongoid::Contextual::Mongo do
           expect(context.send(method)).to eq(depeche_mode)
         end
 
-        context 'when the criteria has a collation', if: collation_supported? do
+        context 'when the criteria has a collation' do
+          min_server_version '3.4'
 
           let(:criteria) do
             Band.where(name: "DEPECHE MODE").collation(locale: 'en_US', strength: 2)
@@ -1553,6 +1565,10 @@ describe Mongoid::Contextual::Mongo do
       }}
     end
 
+    let(:ordered_results) do
+      results['results'].sort_by { |doc| doc['_id'] }
+    end
+
     context "when no selection is provided" do
 
       let(:criteria) do
@@ -1584,36 +1600,40 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "contains the entire raw results" do
-        expect(results["results"]).to eq([
+        expect(ordered_results).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
           { "_id" => "Tool", "value" => { "likes" => 100 }}
         ])
       end
 
-      it "contains the execution time" do
-        expect(results.time).to_not be_nil
-      end
+      context 'when statistics are available' do
+        max_server_version '4.2'
 
-      it "contains the count statistics" do
-        expect(results["counts"]).to eq({
-          "input" => 2, "emit" => 2, "reduce" => 0, "output" => 2
-        })
-      end
+        it "contains the execution time" do
+          expect(results.time).to_not be_nil
+        end
 
-      it "contains the input count" do
-        expect(results.input).to eq(2)
-      end
+        it "contains the count statistics" do
+          expect(results["counts"]).to eq({
+            "input" => 2, "emit" => 2, "reduce" => 0, "output" => 2
+          })
+        end
 
-      it "contains the emitted count" do
-        expect(results.emitted).to eq(2)
-      end
+        it "contains the input count" do
+          expect(results.input).to eq(2)
+        end
 
-      it "contains the reduced count" do
-        expect(results.reduced).to eq(0)
-      end
+        it "contains the emitted count" do
+          expect(results.emitted).to eq(2)
+        end
+
+        it "contains the reduced count" do
+          expect(results.reduced).to eq(0)
+        end
 
-      it "contains the output count" do
-        expect(results.output).to eq(2)
+        it "contains the output count" do
+          expect(results.output).to eq(2)
+        end
       end
     end
 
@@ -1642,35 +1662,39 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "contains the entire raw results" do
-        expect(results["results"]).to eq([
+        expect(ordered_results).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }}
         ])
       end
 
-      it "contains the execution time" do
-        expect(results.time).to_not be_nil
-      end
+      context 'when statistics are available' do
+        max_server_version '4.2'
 
-      it "contains the count statistics" do
-        expect(results["counts"]).to eq({
-          "input" => 1, "emit" => 1, "reduce" => 0, "output" => 1
-        })
-      end
+        it "contains the execution time" do
+          expect(results.time).to_not be_nil
+        end
 
-      it "contains the input count" do
-        expect(results.input).to eq(1)
-      end
+        it "contains the count statistics" do
+          expect(results["counts"]).to eq({
+            "input" => 1, "emit" => 1, "reduce" => 0, "output" => 1
+          })
+        end
 
-      it "contains the emitted count" do
-        expect(results.emitted).to eq(1)
-      end
+        it "contains the input count" do
+          expect(results.input).to eq(1)
+        end
 
-      it "contains the reduced count" do
-        expect(results.reduced).to eq(0)
-      end
+        it "contains the emitted count" do
+          expect(results.emitted).to eq(1)
+        end
+
+        it "contains the reduced count" do
+          expect(results.reduced).to eq(0)
+        end
 
-      it "contains the output count" do
-        expect(results.output).to eq(1)
+        it "contains the output count" do
+          expect(results.output).to eq(1)
+        end
       end
     end
 
@@ -1710,7 +1734,7 @@ describe Mongoid::Contextual::Mongo do
       end
 
       it "contains the entire raw results" do
-        expect(results["results"]).to eq([
+        expect(ordered_results).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
           { "_id" => "Tool", "value" => { "likes" => 100 }}
         ])
@@ -1827,6 +1851,8 @@ describe Mongoid::Contextual::Mongo do
     end
 
     context "when the output specifies a different db" do
+      # Limit is not supported in sharded clusters
+      require_topology :single, :replica_set
 
       let(:criteria) do
         Band.limit(1)
@@ -2161,7 +2187,8 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context 'when provided array filters', if: array_filters_supported? do
+    context 'when provided array filters' do
+      min_server_version '3.6'
 
       before do
         Band.delete_all
@@ -2333,7 +2360,8 @@ describe Mongoid::Contextual::Mongo do
       end
     end
 
-    context 'when provided array filters', if: array_filters_supported? do
+    context 'when provided array filters' do
+      min_server_version '3.6'
 
       before do
         Band.delete_all
@@ -2371,7 +2399,7 @@ describe Mongoid::Contextual::Mongo do
 
   describe '#pipeline' do
 
-    context 'when the criteria has a selector', if: non_legacy_server? do
+    context 'when the criteria has a selector' do
 
       before do
         Artist.index(name: "text")

data/spec/mongoid/contextual/none_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Contextual::None do

data/spec/mongoid/copyable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # -*- coding: utf-8 -*-
 require "spec_helper"
 

data/spec/mongoid/copyable_spec_models.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module CopyableSpec
   class A
     include Mongoid::Document

data/spec/mongoid/criteria/findable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require "spec_helper"
 
 describe Mongoid::Criteria::Findable do
@@ -35,6 +38,42 @@ describe Mongoid::Criteria::Findable do
           expect(found).to eq(band)
         end
       end
+
+      context 'when criteria has additional conditions' do
+        let(:band) do
+          Band.create(name: "Tool")
+        end
+
+        let(:found) do
+          Band.where(name: 'Blah').find(band.id)
+        end
+
+        it 'respects conditions' do
+          expect do
+            found
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+        end
+      end
+
+      context 'when criteria has additional conditions on id' do
+        let(:band) do
+          Band.create(name: "Tool")
+        end
+
+        let(:other) do
+          Band.create(name: "Other")
+        end
+
+        let(:found) do
+          Band.where(id: other.id).find(band.id)
+        end
+
+        it 'respects both conditions' do
+          expect do
+            found
+          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+        end
+      end
     end
 
     context "when using object ids" do
@@ -1196,4 +1235,23 @@ describe Mongoid::Criteria::Findable do
       end
     end
   end
+
+  describe '#from_database_selector' do
+    let(:criteria) { Mongoid::Criteria.new(Band) }
+    let(:result) { criteria.send(:from_database_selector, [1]) }
+
+    context 'when criteria is empty' do
+      it 'adds id' do
+        expect(result.selector).to eq('_id' => 1)
+      end
+    end
+
+    context 'when criteria is restricted by id' do
+      let(:criteria) { Mongoid::Criteria.new(Band).where(id: 2) }
+
+      it 'adds id' do
+        expect(result.selector).to eq('_id' => 2, '$and' => [{'_id' => 1}])
+      end
+    end
+  end
 end