mongoid 7.5.4 → 8.1.9

data/spec/integration/i18n_fallbacks_spec.rb

@@ -3,30 +3,15 @@
 require 'spec_helper'
 
 describe 'i18n fallbacks' do
-  # These tests modify the environment
-  before(:all) do
-    unless %w(yes true 1).include?((ENV['TEST_I18N_FALLBACKS'] || '').downcase)
-      skip 'Set TEST_I18N_FALLBACKS=1 environment variable to run these tests'
-    end
-  end
-
-  before(:all) do
-    puts "I18n version: #{I18n::VERSION}"
-
-    require "i18n/backend/fallbacks"
-    I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-  end
+  require_fallbacks
 
   context 'when fallbacks are enabled with a locale list' do
+    with_default_i18n_configs
+
     before do
-      I18n.default_locale = :en
       I18n.fallbacks[:de] = [ :en ]
     end
 
-    after do
-      I18n.locale = :en
-    end
-
     context 'when translation is present in active locale' do
       it 'uses active locale' do
         product = Product.new
@@ -40,10 +25,6 @@ describe 'i18n fallbacks' do
     end
 
     context 'when translation is missing in active locale and present in fallback locale' do
-      after do
-        I18n.locale = :en
-      end
-
       it 'falls back on default locale' do
         product = Product.new
         I18n.locale = :en
@@ -51,7 +32,6 @@ describe 'i18n fallbacks' do
         I18n.locale = :de
         product.description.should == 'Marvelous!'
       end
-
     end
 
     context 'when translation is missing in all locales' do
@@ -64,10 +44,6 @@ describe 'i18n fallbacks' do
           end
         end
 
-        after do
-          I18n.locale = :en
-        end
-
         it 'returns nil' do
           product = Product.new
           I18n.locale = :en
@@ -75,7 +51,6 @@ describe 'i18n fallbacks' do
           I18n.locale = :ru
           product.description.should be nil
         end
-
       end
 
       context 'i18n 1.0' do
@@ -86,10 +61,6 @@ describe 'i18n fallbacks' do
           end
         end
 
-        after do
-          I18n.locale = :en
-        end
-
         it 'falls back on default locale' do
           product = Product.new
           I18n.locale = :en

data/spec/integration/matcher_examples_spec.rb

@@ -652,10 +652,12 @@ describe 'Matcher' do
 
     describe 'range match on array element' do
 
+      let(:record) do
+        Record.new(producers: [123, 456])
+      end
+
       let!(:band) do
-        Band.create!(records: [
-          Record.new(producers: [123, 456]),
-        ])
+        Band.create!(records: [ record ])
       end
 
       describe 'MongoDB query' do
@@ -667,14 +669,13 @@ describe 'Matcher' do
           expect(found_band).to eq(band)
         end
 
-        # https://jira.mongodb.org/browse/MONGOID-4911
         context 'no match' do
 
-        let!(:band) do
-          Band.create!(records: [
-            Record.new(producers: [50]),
-          ])
-        end
+          let!(:band) do
+            Band.create!(records: [
+              Record.new(producers: [50, 250]),
+            ])
+          end
 
           it 'does not find' do
             expect(found_band).to be nil
@@ -687,10 +688,16 @@ describe 'Matcher' do
           band.records.where(producers: 100..200).first
         end
 
-        it 'raises InvalidQuery' do
-          lambda do
-            found_record
-          end.should raise_error(Mongoid::Errors::InvalidQuery)
+        let(:no_record) do
+          band.records.where(producers: 199..200).first
+        end
+
+        it 'finds correctly' do
+          expect(found_record).to eq(record)
+        end
+
+        it "correctly does not find" do
+          expect(no_record).to eq(nil)
         end
       end
     end

data/spec/integration/matcher_operator_data/type_decimal.yml

@@ -29,12 +29,13 @@
   matches: false
   min_server_version: 3.4
 
-- name: BigDecimal field - does not match
+# Requires :map_big_decimal_to_decimal128 option to be true.
+- name: BigDecimal field - matches
   document:
     big_decimal_field: !ruby/object:BigDecimal
       18:0.42e2
   query:
     big_decimal_field:
       $type: 19
-  matches: false
+  matches: true
   min_server_version: 3.4

data/spec/integration/matcher_operator_spec.rb

@@ -12,6 +12,8 @@ def mop_error?(spec, kind)
 end
 
 describe 'Matcher operators' do
+  config_override :map_big_decimal_to_decimal128, true
+
   Dir[File.join(File.dirname(__FILE__), 'matcher_operator_data', '*.yml')].sort.each do |path|
     context File.basename(path) do
       permitted_classes = [ BigDecimal,
@@ -35,11 +37,7 @@ describe 'Matcher operators' do
                             BSON::Timestamp,
                             BSON::Undefined ]
 
-      specs = if RUBY_VERSION.start_with?("2.5")
-                YAML.safe_load(File.read(path), permitted_classes, [], true)
-              else
-                YAML.safe_load(File.read(path), permitted_classes: permitted_classes, aliases: true)
-              end
+      specs = YAML.safe_load(File.read(path), permitted_classes: permitted_classes, aliases: true)
 
       specs.each do |spec|
         context spec['name'] do

data/spec/integration/persistence/range_field_spec.rb

@@ -0,0 +1,350 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Range field persistence' do
+  let!(:person) { Person.create!(field => value).reload }
+  subject { person.send(field) }
+  let(:now_utc) { Time.now }
+  let(:later_utc) { now_utc + 10.minutes }
+  let(:now_in_zone) { now_utc.in_time_zone('Asia/Tokyo') }
+  let(:later_in_zone) { later_utc.in_time_zone('Asia/Tokyo') }
+
+  context 'static field' do
+    let(:field) { :range }
+
+    context 'when Integer' do
+      let(:value) { 1..3 }
+      it do
+        expect(subject).to eq(1..3)
+      end
+    end
+
+    context 'when Integer exclude_end' do
+      let(:value) { 1...3 }
+      it { expect(subject).to eq(1...3) }
+    end
+
+    context 'when endless' do
+      ruby_version_gte '2.6'
+      let(:value) { eval('3..') }
+      it { expect(subject).to eq(eval('3..')) }
+    end
+
+    context 'when endless exclude_end' do
+      ruby_version_gte '2.6'
+      let(:value) { eval('3...') }
+      it { expect(subject).to eq(eval('3...')) }
+    end
+
+    context 'when beginning-less' do
+      ruby_version_gte '2.7'
+      let(:value) { eval('..3') }
+      it { expect(subject).to eq(eval('..3')) }
+    end
+
+    context 'when beginning-less exclude_end' do
+      ruby_version_gte '2.7'
+      let(:value) { eval('...3') }
+      it { expect(subject).to eq(eval('...3')) }
+    end
+
+    context 'when Hash<String, Integer>' do
+      let(:value) { { 'min' => 1, 'max' => 3 } }
+      it { expect(subject).to eq(1..3) }
+    end
+
+    context 'when Hash<String, Integer> exclude_end' do
+      let(:value) { { 'min' => 1, 'max' => 3, 'exclude_end' => true } }
+      it { expect(subject).to eq(1...3) }
+    end
+
+    context 'when Hash<Symbol, Integer>' do
+      let(:value) { { min: 1, max: 3 } }
+      it { expect(subject).to eq(1..3) }
+    end
+
+    context 'when Hash<Symbol, Integer> exclude_end' do
+      let(:value) { { min: 1, max: 3, exclude_end: true } }
+      it { expect(subject).to eq(1...3) }
+    end
+
+    context 'when Time' do
+      let(:value) { now_utc..later_utc }
+
+      it do
+        expect(subject).to be_a Range
+        expect(subject.exclude_end?).to eq false
+        expect(subject.first).to be_within(0.01.second).of(now_utc)
+        expect(subject.last).to be_within(0.01.second).of(later_utc)
+        expect(subject.first.class).to eq Time
+        expect(subject.last.class).to eq Time
+      end
+    end
+
+    context 'when Time exclude_end' do
+      let(:value) { now_utc...later_utc }
+
+      it do
+        expect(subject).to be_a Range
+        expect(subject.exclude_end?).to eq true
+        expect(subject.first).to be_within(0.01.second).of(now_utc)
+        expect(subject.last).to be_within(0.01.second).of(later_utc)
+        expect(subject.first.class).to eq Time
+        expect(subject.last.class).to eq Time
+      end
+    end
+
+    context 'when Hash<String, Time>' do
+      let(:value) { { 'min' => now_utc, 'max' => later_utc } }
+
+      it do
+        expect(subject).to be_a Range
+        expect(subject.exclude_end?).to eq false
+        expect(subject.first).to be_within(0.01.second).of(now_utc)
+        expect(subject.last).to be_within(0.01.second).of(later_utc)
+        expect(subject.first.class).to eq Time
+        expect(subject.last.class).to eq Time
+      end
+    end
+
+    context 'when Hash<String, Time> exclude_end' do
+      let(:value) { { 'min' => now_utc, 'max' => later_utc, 'exclude_end' => true } }
+
+      it do
+        expect(subject).to be_a Range
+        expect(subject.exclude_end?).to eq true
+        expect(subject.first).to be_within(0.01.second).of(now_utc)
+        expect(subject.last).to be_within(0.01.second).of(later_utc)
+        expect(subject.first.class).to eq Time
+        expect(subject.last.class).to eq Time
+      end
+    end
+
+    context 'when ActiveSupport::TimeWithZone' do
+      let(:value) { now_in_zone..later_in_zone }
+
+      it do
+        expect(subject).to be_a Range
+        expect(subject.exclude_end?).to eq false
+        expect(subject.first).to be_within(0.01.second).of(now_utc)
+        expect(subject.last).to be_within(0.01.second).of(later_utc)
+        expect(subject.first.class).to eq Time
+        expect(subject.last.class).to eq Time
+      end
+    end
+
+    context 'when ActiveSupport::TimeWithZone exclude_end' do
+      let(:value) { now_in_zone...later_in_zone }
+
+      it do
+        expect(subject).to be_a Range
+        expect(subject.exclude_end?).to eq true
+        expect(subject.first).to be_within(0.01.second).of(now_utc)
+        expect(subject.last).to be_within(0.01.second).of(later_utc)
+        expect(subject.first.class).to eq Time
+        expect(subject.last.class).to eq Time
+      end
+    end
+
+    context 'when Hash<String, ActiveSupport::TimeWithZone>' do
+      let(:value) { { 'min' => now_in_zone, 'max' => later_in_zone } }
+
+      it do
+        expect(subject).to be_a Range
+        expect(subject.exclude_end?).to eq false
+        expect(subject.first).to be_within(0.01.second).of(now_utc)
+        expect(subject.last).to be_within(0.01.second).of(later_utc)
+        expect(subject.first.class).to eq Time
+        expect(subject.last.class).to eq Time
+      end
+    end
+
+    context 'when Hash<String, ActiveSupport::TimeWithZone> exclude_end' do
+      let(:value) { { 'min' => now_in_zone, 'max' => later_in_zone, 'exclude_end' => true } }
+
+      it do
+        expect(subject).to be_a Range
+        expect(subject.exclude_end?).to eq true
+        expect(subject.first).to be_within(0.01.second).of(now_utc)
+        expect(subject.last).to be_within(0.01.second).of(later_utc)
+        expect(subject.first.class).to eq Time
+        expect(subject.last.class).to eq Time
+      end
+    end
+  end
+
+  context 'dynamic field' do
+    let(:field) { :dynamic }
+
+    context 'when Integer' do
+      let(:value) { 1..3 }
+      it do
+        expect(subject).to eq('max' => 3, 'min' => 1)
+      end
+    end
+
+    context 'when Integer exclude_end' do
+      let(:value) { 1...3 }
+      it { expect(subject).to eq('max' => 3, 'min' => 1, 'exclude_end' => true) }
+    end
+
+    context 'when descending' do
+      let(:value) { 3..1 }
+      it { expect(subject).to eq('max' => 1, 'min' => 3) }
+    end
+
+    context 'when descending exclude_end' do
+      let(:value) { 3...1 }
+      it { expect(subject).to eq('max' => 1, 'min' => 3, 'exclude_end' => true) }
+    end
+
+    context 'when endless' do
+      ruby_version_gte '2.6'
+      let(:value) { eval('3..') }
+      it { expect(subject).to eq('min' => 3) }
+    end
+
+    context 'when endless exclude_end' do
+      ruby_version_gte '2.6'
+      let(:value) { eval('3...') }
+      it { expect(subject).to eq('min' => 3, 'exclude_end' => true) }
+    end
+
+    context 'when beginning-less' do
+      ruby_version_gte '2.7'
+      let(:value) { eval('..3') }
+      it { expect(subject).to eq('max' => 3) }
+    end
+
+    context 'when beginning-less exclude_end' do
+      ruby_version_gte '2.7'
+      let(:value) { eval('...3') }
+      it { expect(subject).to eq('max' => 3, 'exclude_end' => true) }
+    end
+
+    context 'when Hash<String, Integer>' do
+      let(:value) { { 'min' => 1, 'max' => 3 } }
+      it { expect(subject).to eq('max' => 3, 'min' => 1) }
+    end
+
+    context 'when Hash<String, Integer> exclude_end' do
+      let(:value) { { 'min' => 1, 'max' => 3, 'exclude_end' => true } }
+      it { expect(subject).to eq('max' => 3, 'min' => 1, 'exclude_end' => true) }
+    end
+
+    context 'when Hash<Symbol, Integer>' do
+      let(:value) { { min: 1, max: 3 } }
+      it { expect(subject).to eq('max' => 3, 'min' => 1) }
+    end
+
+    context 'when Hash<Symbol, Integer> exclude_end' do
+      let(:value) { { min: 1, max: 3, exclude_end: true } }
+      it { expect(subject).to eq('max' => 3, 'min' => 1, 'exclude_end' => true) }
+    end
+
+    context 'when Time' do
+      let(:value) { now_utc..later_utc }
+
+      it do
+        expect(subject).to be_a Hash
+        expect(subject['exclude_end']).to eq nil
+        expect(subject['min']).to be_within(0.01.second).of(now_utc)
+        expect(subject['max']).to be_within(0.01.second).of(later_utc)
+        expect(subject['min'].class).to eq Time
+        expect(subject['max'].class).to eq Time
+      end
+    end
+
+    context 'when Time exclude_end' do
+      let(:value) { now_utc...later_utc }
+
+      it do
+        expect(subject).to be_a Hash
+        expect(subject['exclude_end']).to eq true
+        expect(subject['min']).to be_within(0.01.second).of(now_utc)
+        expect(subject['max']).to be_within(0.01.second).of(later_utc)
+        expect(subject['min'].class).to eq Time
+        expect(subject['max'].class).to eq Time
+      end
+    end
+
+    context 'when Hash<String, Time>' do
+      let(:value) { { 'min' => now_utc, 'max' => later_utc } }
+
+      it do
+        expect(subject).to be_a Hash
+        expect(subject['exclude_end']).to eq nil
+        expect(subject['min']).to be_within(0.01.second).of(now_utc)
+        expect(subject['max']).to be_within(0.01.second).of(later_utc)
+        expect(subject['min'].class).to eq Time
+        expect(subject['max'].class).to eq Time
+      end
+    end
+
+    context 'when Hash<String, Time> exclude_end' do
+      let(:value) { { 'min' => now_utc, 'max' => later_utc, 'exclude_end' => true } }
+
+      it do
+        expect(subject).to be_a Hash
+        expect(subject['exclude_end']).to eq true
+        expect(subject['min']).to be_within(0.01.second).of(now_utc)
+        expect(subject['max']).to be_within(0.01.second).of(later_utc)
+        expect(subject['min'].class).to eq Time
+        expect(subject['max'].class).to eq Time
+      end
+    end
+
+    context 'when ActiveSupport::TimeWithZone' do
+      let(:value) { now_in_zone..later_in_zone }
+
+      it do
+        expect(subject).to be_a Hash
+        expect(subject['exclude_end']).to eq nil
+        expect(subject['min']).to be_within(0.01.second).of(now_utc)
+        expect(subject['max']).to be_within(0.01.second).of(later_utc)
+        expect(subject['min'].class).to eq Time
+        expect(subject['max'].class).to eq Time
+      end
+    end
+
+    context 'when ActiveSupport::TimeWithZone exclude_end' do
+      let(:value) { now_in_zone...later_in_zone }
+
+      it do
+        expect(subject).to be_a Hash
+        expect(subject['exclude_end']).to eq true
+        expect(subject['min']).to be_within(0.01.second).of(now_utc)
+        expect(subject['max']).to be_within(0.01.second).of(later_utc)
+        expect(subject['min'].class).to eq Time
+        expect(subject['max'].class).to eq Time
+      end
+    end
+
+    context 'when Hash<String, ActiveSupport::TimeWithZone>' do
+      let(:value) { { 'min' => now_in_zone, 'max' => later_in_zone } }
+
+      it do
+        expect(subject).to be_a Hash
+        expect(subject['exclude_end']).to eq nil
+        expect(subject['min']).to be_within(0.01.second).of(now_utc)
+        expect(subject['max']).to be_within(0.01.second).of(later_utc)
+        expect(subject['min'].class).to eq Time
+        expect(subject['max'].class).to eq Time
+      end
+    end
+
+    context 'when Hash<String, ActiveSupport::TimeWithZone> exclude_end' do
+      let(:value) { { 'min' => now_in_zone, 'max' => later_in_zone, 'exclude_end' => true } }
+
+      it do
+        expect(subject).to be_a Hash
+        expect(subject['exclude_end']).to eq true
+        expect(subject['min']).to be_within(0.01.second).of(now_utc)
+        expect(subject['max']).to be_within(0.01.second).of(later_utc)
+        expect(subject['min'].class).to eq Time
+        expect(subject['max'].class).to eq Time
+      end
+    end
+  end
+end

data/spec/mongoid/association/counter_cache_spec.rb

@@ -133,7 +133,7 @@ describe Mongoid::Association::Referenced::CounterCache do
       it "expect to raise an error" do
         expect {
           Person.reset_counters "1", :drugs
-        }.to raise_error(Mongoid::Errors::DocumentNotFound)
+        }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Person with id\(s\)/)
       end
     end
 

data/spec/mongoid/association/depending_spec.rb

@@ -73,7 +73,7 @@ describe Mongoid::Association::Depending do
             r = DependentReportCard.create!(dependent_student: s)
             s.destroy!
 
-            expect { DependentReportCard.find(r.id) }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            expect { DependentReportCard.find(r.id) }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class DependentReportCard with id\(s\)/)
           end
 
           it 'facilitates proper transitive destroying of the object' do
@@ -84,7 +84,7 @@ describe Mongoid::Association::Depending do
             r = DependentReportCard.create!(dependent_student: s)
             s.destroy!
 
-            expect { DependentReportCard.find(r.id) }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            expect { DependentReportCard.find(r.id) }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class DependentReportCard with id\(s\)/)
           end
 
           it 'adds the dependent to subclasses' do
@@ -105,7 +105,7 @@ describe Mongoid::Association::Depending do
             r = DependentReportCard.create!(dependent_student: s)
             s.destroy!
 
-            expect { DependentReportCard.find(r.id) }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            expect { DependentReportCard.find(r.id) }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class DependentReportCard with id\(s\)/)
           end
 
           it "doesn't add the dependent to sibling classes" do
@@ -177,7 +177,7 @@ describe Mongoid::Association::Depending do
 
             expect {
               DependentOwnedOne.find(owned.id)
-            }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class DependentOwnedOne with id\(s\)/)
           end
         end
 
@@ -250,7 +250,7 @@ describe Mongoid::Association::Depending do
             dep = Dep.create!(double_assoc: two)
             two.destroy!
 
-            expect { Dep.find(dep.id) }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            expect { Dep.find(dep.id) }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Dep with id\(s\)/)
           end
         end
       end
@@ -362,7 +362,7 @@ describe Mongoid::Association::Depending do
           it "deletes the associated documents" do
             expect {
               child.class.find(child.id)
-            }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class #{child.class.to_s} with id\(s\)/)
           end
         end
 
@@ -674,7 +674,7 @@ describe Mongoid::Association::Depending do
           it "persists the deletion" do
             expect {
               home.reload
-            }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Home with id\(s\)/)
           end
         end
 
@@ -733,13 +733,13 @@ describe Mongoid::Association::Depending do
             it "persists the first deletion" do
               expect {
                 post_one.reload
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Post with id\(s\)/)
             end
 
             it "persists the second deletion" do
               expect {
                 post_two.reload
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Post with id\(s\)/)
             end
           end
         end

data/spec/mongoid/association/eager_spec.rb

@@ -14,14 +14,36 @@ describe Mongoid::Association::EagerLoadable do
       Mongoid::Contextual::Mongo.new(criteria)
     end
 
+    let(:association_host) { Account }
+
     let(:inclusions) do
       includes.map do |key|
-        Account.reflect_on_association(key)
+        association_host.reflect_on_association(key)
       end
     end
 
     let(:doc) { criteria.first }
 
+    context 'when root is an STI subclass' do
+      # Driver has_one Vehicle
+      # Vehicle belongs_to Driver
+      # Truck is a Vehicle
+
+      before do
+        Driver.create!(vehicle: Truck.new)
+      end
+
+      let(:criteria) { Truck.all }
+      let(:includes) { %i[ driver ] }
+      let(:association_host) { Truck }
+
+      it 'preloads the driver' do
+        expect(doc.ivar(:driver)).to be false
+        context.preload(inclusions, [ doc ])
+        expect(doc.ivar(:driver)).to be == Driver.first
+      end
+    end
+
     context "when belongs_to" do
 
       let!(:account) do
@@ -42,7 +64,7 @@ describe Mongoid::Association::EagerLoadable do
       it "preloads the parent" do
         expect(doc.ivar(:person)).to be false
         context.preload(inclusions, [doc])
-        expect(doc.ivar(:person)).to eq(doc.person)
+        expect(doc.ivar(:person)).to be == person
       end
     end
 
@@ -244,7 +266,8 @@ describe Mongoid::Association::EagerLoadable do
       end
 
       it "runs the has_one preload" do
-        expect(Mongoid::Association::Referenced::HasOne::Eager).to receive(:new).with([book_association, cat_association], docs).once.and_call_original
+        expect(Mongoid::Association::Referenced::HasOne::Eager).to receive(:new).with([ book_association ], docs).once.and_call_original
+        expect(Mongoid::Association::Referenced::HasOne::Eager).to receive(:new).with([ cat_association ], docs).once.and_call_original
         context.eager_load(docs)
       end
     end

data/spec/mongoid/association/embedded/embedded_in/binding_spec.rb

@@ -58,7 +58,8 @@ describe Mongoid::Association::Embedded::EmbeddedIn::Binding do
         end
 
         it "does nothing" do
-          expect(name).to receive(:namable=).never
+          expect(name).to receive(:namable=).with(person).never
+          expect(name).to receive(:namable=).with(nil).once
           binding.bind_one
         end
       end