mongoid 7.1.0 → 7.1.6

data/spec/mongoid/contextual/mongo_spec.rb

@@ -171,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)
@@ -232,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)
@@ -336,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)
@@ -458,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')
@@ -496,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)
@@ -853,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)
@@ -1006,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)
@@ -1080,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)
@@ -1152,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)
@@ -1556,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
@@ -1587,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 output count" do
-        expect(results.output).to eq(2)
+        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)
+        end
       end
     end
 
@@ -1645,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 output count" do
-        expect(results.output).to eq(1)
+        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)
+        end
       end
     end
 
@@ -1713,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 }}
         ])
@@ -2166,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
@@ -2338,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
@@ -2376,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/criteria/queryable/extensions/regexp_raw_spec.rb

@@ -3,7 +3,7 @@
 
 require "spec_helper"
 
-describe Mongoid::Criteria::Queryable::Extensions::Regexp::Raw do
+describe Mongoid::Criteria::Queryable::Extensions::Regexp::Raw_ do
 
   describe ".evolve" do
 

data/spec/mongoid/criteria/queryable/extensions/regexp_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
     context "when provided a regexp" do
 
       let(:regexp) do
-        /^[123]/
+        /\A[123]/
       end
 
       let(:evolved) do
@@ -26,7 +26,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
     context "when provided a string" do
 
       let(:regexp) do
-        "^[123]"
+        "\\A[123]"
       end
 
       let(:evolved) do
@@ -34,7 +34,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
       end
 
       it "returns the converted regexp" do
-        expect(evolved).to eq(/^[123]/)
+        expect(evolved).to eq(/\A[123]/)
       end
     end
 
@@ -43,7 +43,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
       context "when the elements are regexps" do
 
         let(:regexp) do
-          /^[123]/
+          /\A[123]/
         end
 
         let(:array) do
@@ -66,7 +66,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
       context "when the elements are strings" do
 
         let(:regexp) do
-          "^[123]"
+          "\\A[123]"
         end
 
         let(:evolved) do
@@ -74,7 +74,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
         end
 
         it "returns the regexps" do
-          expect(evolved).to eq([ /^[123]/ ])
+          expect(evolved).to eq([ /\A[123]/ ])
         end
       end
     end
@@ -83,7 +83,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
   describe "#regexp?" do
 
     let(:regexp) do
-      /^[123]/
+      /\A[123]/
     end
 
     it "returns true" do

data/spec/mongoid/criteria/queryable/extensions/string_spec.rb

@@ -318,7 +318,7 @@ describe String do
     context "when provided a regex" do
 
       let(:regex) do
-        /^[123]/
+        /\A[123]/.freeze
       end
 
       let(:evolved) do

data/spec/mongoid/criteria/queryable/extensions/time_spec.rb

@@ -354,23 +354,35 @@ describe Time do
 
   describe "#__evolve_date__" do
 
-    let(:time) do
-      Time.new(2010, 1, 1, 12, 0, 0)
-    end
-
     let(:evolved) do
       time.__evolve_date__
     end
 
-    it "returns midnight utc" do
-      expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+    context 'beginning of day' do
+      let(:time) do
+        Time.new(2010, 1, 1, 0, 0, 1).freeze
+      end
+
+      it "returns midnight utc" do
+        expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+      end
+    end
+
+    context 'end of day' do
+      let(:time) do
+        Time.new(2010, 1, 1, 23, 59, 59).freeze
+      end
+
+      it "returns midnight utc" do
+        expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+      end
     end
   end
 
   describe "#__evolve_time__" do
 
     let(:time) do
-      Time.new(2010, 1, 1, 12, 0, 0)
+      Time.new(2010, 1, 1, 12, 0, 0).freeze
     end
 
     let(:evolved) do

data/spec/mongoid/criteria/queryable/extensions/time_with_zone_spec.rb

@@ -325,10 +325,37 @@ describe ActiveSupport::TimeWithZone do
     end
   end
 
+  describe "#__evolve_date__" do
+
+    let(:evolved) do
+      time.__evolve_date__
+    end
+
+    context 'beginning of day' do
+      let(:time) do
+        time_zone.local(2010, 1, 1, 0, 0, 1).freeze
+      end
+
+      it "returns midnight utc" do
+        expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+      end
+    end
+
+    context 'end of day' do
+      let(:time) do
+        time_zone.local(2010, 1, 1, 23, 59, 59).freeze
+      end
+
+      it "returns midnight utc" do
+        expect(evolved).to eq(Time.utc(2010, 1, 1, 0, 0, 0))
+      end
+    end
+  end
+
   describe "#__evolve_time__" do
 
     let(:date) do
-      time_zone.local(2010, 1, 1, 12, 0, 0)
+      time_zone.local(2010, 1, 1, 12, 0, 0).freeze
     end
 
     let(:evolved) do

data/spec/mongoid/criteria/queryable/mergeable_spec.rb

@@ -5,11 +5,11 @@ require "spec_helper"
 
 describe Mongoid::Criteria::Queryable::Mergeable do
 
-  describe "#intersect" do
+  let(:query) do
+    Mongoid::Query.new
+  end
 
-    let(:query) do
-      Mongoid::Query.new
-    end
+  describe "#intersect" do
 
     before do
       query.intersect
@@ -22,10 +22,6 @@ describe Mongoid::Criteria::Queryable::Mergeable do
 
   describe "#override" do
 
-    let(:query) do
-      Mongoid::Query.new
-    end
-
     before do
       query.override
     end
@@ -37,10 +33,6 @@ describe Mongoid::Criteria::Queryable::Mergeable do
 
   describe "#union" do
 
-    let(:query) do
-      Mongoid::Query.new
-    end
-
     before do
       query.union
     end
@@ -49,4 +41,45 @@ describe Mongoid::Criteria::Queryable::Mergeable do
       expect(query.strategy).to eq(:__union__)
     end
   end
+
+  describe '#_mongoid_expand_keys' do
+    it 'expands simple keys' do
+      query.send(:_mongoid_expand_keys, {a: 1}).should == {a: 1}
+    end
+
+    let(:gt) do
+      Mongoid::Criteria::Queryable::Key.new("age", :__override__, "$gt")
+    end
+
+    let(:gtp) do
+      Mongoid::Criteria::Queryable::Key.new("age", :__override__, "$gt")
+    end
+
+    let(:lt) do
+      Mongoid::Criteria::Queryable::Key.new("age", :__override__, "$lt")
+    end
+
+    it 'expands Key instances' do
+      query.send(:_mongoid_expand_keys, {gt => 42}).should == {'age' => {'$gt' => 42}}
+    end
+
+    it 'expands multiple Key instances on the same field' do
+      query.send(:_mongoid_expand_keys, {gt => 42, lt => 50}).should == {
+        'age' => {'$gt' => 42, '$lt' => 50}}
+    end
+
+    it 'expands simple and Key instances on the same field' do
+      query.send(:_mongoid_expand_keys, {'age' => 42, lt => 50}).should == {
+        'age' => {'$eq' => 42, '$lt' => 50}}
+    end
+
+    it 'expands Key and simple instances on the same field' do
+      query.send(:_mongoid_expand_keys, {gt => 42, 'age' => 50}).should == {
+        'age' => {'$gt' => 42, '$eq' => 50}}
+    end
+
+    it 'Ruby does not allow same symbol operator with different values' do
+      {gt => 42, gtp => 50}.should == {gtp => 50}
+    end
+  end
 end