mongoid 7.0.6 → 7.0.12

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

@@ -8,7 +8,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
     context "when provided a regexp" do
 
       let(:regexp) do
-        /^[123]/
+        /\A[123]/
       end
 
       let(:evolved) do
@@ -23,7 +23,7 @@ describe Mongoid::Criteria::Queryable::Extensions::Regexp do
     context "when provided a string" do
 
       let(:regexp) do
-        "^[123]"
+        "\\A[123]"
       end
 
       let(:evolved) do
@@ -31,7 +31,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
 
@@ -40,7 +40,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
@@ -63,7 +63,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
@@ -71,7 +71,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
@@ -80,7 +80,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

@@ -315,7 +315,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

@@ -346,23 +346,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

@@ -322,10 +322,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_spec.rb

@@ -2334,7 +2334,7 @@ describe Mongoid::Criteria do
       end
 
       it "returns the map/reduce results" do
-        expect(map_reduce).to eq([
+        expect(map_reduce.sort_by { |doc| doc['_id'] }).to eq([
           { "_id" => "Depeche Mode", "value" => { "likes" => 200 }},
           { "_id" => "Tool", "value" => { "likes" => 100 }}
         ])
@@ -3499,7 +3499,8 @@ describe Mongoid::Criteria do
         end
       end
 
-      context "when querying on a BSON::Decimal128", if: decimal128_supported? do
+      context "when querying on a BSON::Decimal128" do
+        min_server_version '3.4'
 
         let(:decimal) do
           BSON::Decimal128.new("0.0005")
@@ -3553,6 +3554,7 @@ describe Mongoid::Criteria do
     end
 
     context "when the code has scope" do
+      max_server_version '4.2'
 
       let(:criteria) do
         Band.for_js("this.name == param", param: "Depeche Mode")

data/spec/mongoid/document_persistence_context_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Mongoid::Document do
+
+  let(:klass) do
+    Person
+  end
+
+  let(:person) do
+    Person.new
+  end
+
+  describe '.client_name' do
+    it 'returns client name' do
+      Person.client_name.should == :default
+    end
+  end
+
+  describe '.database_name' do
+    it 'returns database name' do
+      Person.database_name.should == 'mongoid_test'
+    end
+  end
+
+  describe '.collection_name' do
+    it 'returns collection name' do
+      Person.collection_name.should == :people
+    end
+  end
+end

data/spec/mongoid/indexable_spec.rb

@@ -45,7 +45,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when database specific options exist", if: non_legacy_server? do
+    context "when database specific options exist" do
 
       let(:klass) do
         Class.new do
@@ -95,7 +95,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when database options are specified", if: non_legacy_server? do
+    context "when database options are specified" do
 
       let(:klass) do
         Class.new do
@@ -133,7 +133,8 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when a collation option is specified", if: collation_supported? do
+    context "when a collation option is specified" do
+      min_server_version '3.4'
 
       let(:klass) do
         Class.new do
@@ -308,7 +309,8 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when providing a collation option", if: collation_supported? do
+    context "when providing a collation option" do
+      min_server_version '3.4'
 
       before do
         klass.index({ name: 1 }, collation: { locale: 'en_US', strength: 2 })

data/spec/mongoid/matchable/default_spec.rb

@@ -68,7 +68,7 @@ describe Mongoid::Matchable::Default do
         context "when the value is a regexp" do
 
           it "returns true" do
-            expect(matcher._matches?(/^Test[3-5]$/)).to be true
+            expect(matcher._matches?(/\ATest[3-5]\z/)).to be true
           end
         end
       end

data/spec/mongoid/matchable/regexp_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::Matchable::Regexp do
     context 'when a BSON::Regexp::Raw object is passed' do
 
       let(:regexp) do
-        BSON::Regexp::Raw.new('^Em')
+        BSON::Regexp::Raw.new("\\AEm")
       end
 
       it 'compiles the regexp object to a native regexp for the matching' do
@@ -37,7 +37,7 @@ describe Mongoid::Matchable::Regexp do
     context 'when a native Regexp object is passed' do
 
       let(:regexp) do
-        /^Em/
+        /\AEm/
       end
 
       it 'calls super with the native regexp' do

data/spec/mongoid/matchable_spec.rb

@@ -293,7 +293,7 @@ describe Mongoid::Matchable do
       context 'when a BSON::Regexp::Raw object is used' do
 
         let(:selector) do
-          { street: BSON::Regexp::Raw.new("^Clarkenwell") }
+          { street: BSON::Regexp::Raw.new("\\AClarkenwell") }
         end
 
         it "returns true" do
@@ -304,7 +304,7 @@ describe Mongoid::Matchable do
       context 'when a native Regexp object is used' do
 
         let(:selector) do
-          { street: /^Clarkenwell/ }
+          { street: /\AClarkenwell/ }
         end
 
         it "returns true" do

data/spec/mongoid/persistable/pushable_spec.rb

@@ -4,7 +4,7 @@ describe Mongoid::Persistable::Pushable do
 
   describe "#add_to_set" do
 
-    context "when the document is a root document" do
+    context "when the document is a top level document" do
 
       shared_examples_for "a unique pushable root document" do
 
@@ -62,6 +62,60 @@ describe Mongoid::Persistable::Pushable do
 
         it_behaves_like "a unique pushable root document"
       end
+
+      context 'when the host model is not saved' do
+        context 'when attribute exists' do
+          let(:person) do
+            Person.new(aliases: [2])
+          end
+
+          it 'records the change' do
+            person.add_to_set({aliases: 1})
+
+            expect(person.aliases).to eq([2, 1])
+          end
+        end
+
+        context 'when attribute does not exist' do
+          let(:person) do
+            Person.new
+          end
+
+          it 'records the change' do
+            person.add_to_set({aliases: 1})
+
+            expect(person.aliases).to eq([1])
+          end
+        end
+      end
+
+      context 'when the host model is loaded from database' do
+        context 'when attribute exists' do
+          let(:person) do
+            Person.create!(aliases: [2])
+            person = Person.last
+          end
+
+          it 'records the change' do
+            person.add_to_set({aliases: 1})
+
+            expect(person.aliases).to eq([2, 1])
+          end
+        end
+
+        context 'when attribute does not exist' do
+          let(:person) do
+            Person.create!
+            person = Person.last
+          end
+
+          it 'records the change' do
+            person.add_to_set({aliases: 1})
+
+            expect(person.aliases).to eq([1])
+          end
+        end
+      end
     end
 
     context "when the document is embedded" do

data/spec/mongoid/query_cache_spec.rb

@@ -7,6 +7,20 @@ describe Mongoid::QueryCache do
     Mongoid::QueryCache.cache { spec.run }
   end
 
+  before(:all) do
+    # It is likely that there are other session leaks in the driver
+    # and/or Mongoid that are unrelated to the query cache. Clear the
+    # SessionRegistry at the start of these tests in order to detect leaks that
+    # occur only within the scope of these tests.
+    #
+    # Other session leaks will be detected and addressed as part of RUBY-2391.
+    SessionRegistry.instance.clear_registry
+  end
+
+  after do
+    SessionRegistry.instance.verify_sessions_ended!
+  end
+
   context 'when iterating over objects sharing the same base' do
 
     let(:server) do
@@ -180,7 +194,8 @@ describe Mongoid::QueryCache do
         end
       end
 
-      context 'when the first query has a collation', if: collation_supported? do
+      context 'when the first query has a collation' do
+        min_server_version '3.4'
 
         before do
           Band.where(name: 'DEPECHE MODE').collation(locale: 'en_US', strength: 2).to_a
@@ -221,6 +236,10 @@ describe Mongoid::QueryCache do
         end
 
         before do
+          10.times do |i|
+            game.ratings << Rating.create!(value: i+1)
+          end
+
           game.ratings.where(:value.gt => 5).asc(:id).all.to_a
         end
 
@@ -228,7 +247,9 @@ describe Mongoid::QueryCache do
 
           it "uses the cache" do
             expect_no_queries do
-              game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
+              result = game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
+              expect(result.length).to eq(2)
+              expect(result.map { |r| r['value'] }).to eq([6, 7])
             end
           end
         end
@@ -241,14 +262,23 @@ describe Mongoid::QueryCache do
         end
 
         before do
+          10.times do |i|
+            game.ratings << Rating.create!(value: i+1)
+          end
+
           game.ratings.where(:value.gt => 5).limit(3).asc(:id).all.to_a
         end
 
         context "when the next query has a limit" do
+          # Server versions older than 3.2 also perform a killCursors operation,
+          # which causes this test to fail.
+          min_server_version '3.2'
 
           it "queries again" do
             expect_query(1) do
-              game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
+              result = game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
+              expect(result.length).to eq(2)
+              expect(result.map { |r| r['value'] }).to eq([6, 7])
             end
           end
         end
@@ -257,7 +287,9 @@ describe Mongoid::QueryCache do
 
           it "queries again" do
             expect_query(1) do
-              game.ratings.where(:value.gt => 5).asc(:id).to_a
+              result = game.ratings.where(:value.gt => 5).asc(:id).to_a
+              expect(result.length).to eq(5)
+              expect(result.map { |r| r['value'] }).to eq([6, 7, 8, 9, 10])
             end
           end
         end
@@ -270,21 +302,34 @@ describe Mongoid::QueryCache do
         end
 
         before do
+          10.times do |i|
+            game.ratings << Rating.create!(value: i+1)
+          end
+
           game.ratings.where(:value.gt => 5).asc(:id).all.to_a
         end
 
         it "does not query again" do
           expect_no_queries do
-            game.ratings.where(:value.gt => 5).asc(:id).first
+            result = game.ratings.where(:value.gt => 5).asc(:id).first
+            expect(result['value']).to eq(6)
           end
         end
       end
 
       context "when limiting the result" do
+        before do
+          Band.destroy_all
+
+          5.times { |i| Band.create!(name: "Band #{i}") }
+          Band.all.to_a
+        end
 
         it "does not query again" do
           expect_query(0) do
-            Band.limit(2).all.to_a
+            result = Band.limit(2).all.to_a
+            expect(result.length).to eq(2)
+            expect(result.map { |r| r["name"] }).to eq(["Band 0", "Band 1"])
           end
         end
       end
@@ -292,12 +337,16 @@ describe Mongoid::QueryCache do
       context "when specifying a different skip value" do
 
         before do
-          Band.limit(2).skip(1).all.to_a
+          Band.destroy_all
+
+          5.times { |i| Band.create!(name: "Band #{i}") }
         end
 
         it "queries again" do
           expect_query(1) do
-            Band.limit(2).skip(3).all.to_a
+            result = Band.limit(2).skip(3).all.to_a
+            expect(result.length).to eq(2)
+            expect(result.map { |r| r["name"] }).to eq(["Band 3", "Band 4"])
           end
         end
       end
@@ -333,6 +382,25 @@ describe Mongoid::QueryCache do
       end
     end
 
+    context 'when querying colleciton larger than the batch size' do
+      before do
+        Band.destroy_all
+        101.times { |i| Band.create!(_id: i) }
+      end
+
+      it 'does not raise an exception when querying multiple times' do
+        expect do
+          results1 = Band.all.to_a
+          expect(results1.length).to eq(101)
+          expect(results1.map { |band| band["_id"] }).to eq([*0..100])
+
+          results2 = Band.all.to_a
+          expect(results2.length).to eq(101)
+          expect(results2.map { |band| band["_id"] }).to eq([*0..100])
+        end.not_to raise_error
+      end
+    end
+
     context "when query caching is enabled and the batch_size is set" do
 
       around(:each) do |example|
@@ -486,7 +554,7 @@ describe Mongoid::QueryCache do
       Mongoid::QueryCache.enabled = true
       10.times { Band.create! }
 
-      Band.batch_size(4).all.any?
+      Band.batch_size(4).all.to_a
     end
 
     it 'does not cache the result' do