mongoid 8.0.10 → 8.1.0

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

@@ -44,7 +44,7 @@ describe Mongoid::Criteria::Queryable::Selector do
       end
     end
 
-    context "when selector contains a $nin string" do
+    context "when selector contains a $nin" do
 
       let(:initial) do
         { "$nin" => ["foo"] }
@@ -72,35 +72,7 @@ describe Mongoid::Criteria::Queryable::Selector do
       end
     end
 
-    context "when selector contains a $nin symbol" do
-
-      let(:initial) do
-        { :$nin => ["foo"] }
-      end
-
-      before do
-        selector["field"] = initial
-      end
-
-      context "when merging in a new $nin" do
-
-        let(:other) do
-          { "field" => { :$nin => ["bar"] } }
-        end
-
-        before do
-          selector.merge!(other)
-        end
-
-        it "combines the two $nin queries into one" do
-          expect(selector).to eq({
-            "field" => { :$nin => ["foo", "bar"] }
-          })
-        end
-      end
-    end
-
-    context "when selector contains a $in string" do
+    context "when selector contains a $in" do
 
       let(:initial) do
         { "$in" => [1, 2] }
@@ -145,51 +117,6 @@ describe Mongoid::Criteria::Queryable::Selector do
       end
     end
 
-    context "when selector contains a $in symbol" do
-
-      let(:initial) do
-        { :$in => [1, 2] }
-      end
-
-      before do
-        selector["field"] = initial
-      end
-
-      context "when merging in a new $in with an intersecting value" do
-
-        let(:other) do
-          { "field" => { :$in => [1] } }
-        end
-
-        before do
-          selector.merge!(other)
-        end
-
-        it "intersects the $in values" do
-          expect(selector).to eq({
-                                     "field" => { :$in => [1] }
-                                 })
-        end
-      end
-
-      context "when merging in a new $in with no intersecting values" do
-
-        let(:other) do
-          { "field" => { :$in => [3] } }
-        end
-
-        before do
-          selector.merge!(other)
-        end
-
-        it "intersects the $in values" do
-          expect(selector).to eq({
-                                     "field" => { :$in => [] }
-                                 })
-        end
-      end
-    end
-
     context "when selector is not nested" do
 
       before do
@@ -681,6 +608,7 @@ describe Mongoid::Criteria::Queryable::Selector do
         end
 
         context "when the serializer is localized" do
+          with_default_i18n_configs
 
           before(:all) do
             class Field
@@ -696,7 +624,6 @@ describe Mongoid::Criteria::Queryable::Selector do
 
           after(:all) do
             Object.send(:remove_const, :Field)
-            ::I18n.locale = :en
           end
 
           let(:selector) do

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

@@ -210,79 +210,7 @@ describe Mongoid::Criteria::Queryable::Storable do
         }
       end
     end
-
-    context 'when value is a hash combine values with different operator keys' do
-      let(:base) do
-        query.add_field_expression('foo', {'$in' => ['bar']})
-      end
-
-      let(:modified) do
-        base.add_field_expression('foo', {'$nin' => ['zoom']})
-      end
-
-      it 'combines the conditions using $and' do
-        modified.selector.should == {
-          'foo' => {
-            '$in' => ['bar'],
-            '$nin' => ['zoom']
-          }
-        }
-      end
-    end
-
-    context 'when value is a hash with symbol operator key combine values with different operator keys' do
-      let(:base) do
-        query.add_field_expression('foo', {:$in => ['bar']})
-      end
-
-      let(:modified) do
-        base.add_field_expression('foo', {:$nin => ['zoom']})
-      end
-
-      it 'combines the conditions using $and' do
-        modified.selector.should == {
-          'foo' => {
-            :$in => ['bar'],
-            :$nin => ['zoom']
-          }
-        }
-      end
-    end
-
-    context 'when value is a hash add values with same operator keys using $and' do
-      let(:base) do
-        query.add_field_expression('foo', {'$in' => ['bar']})
-      end
-
-      let(:modified) do
-        base.add_field_expression('foo', {'$in' => ['zoom']})
-      end
-
-      it 'adds the new condition using $and' do
-        modified.selector.should == {
-          'foo' => {'$in' => ['bar']},
-          '$and' => ['foo' => {'$in' => ['zoom']}]
-        }
-      end
-    end
-
-  context 'when value is a hash with symbol operator key add values with same operator keys using $and' do
-    let(:base) do
-      query.add_field_expression('foo', {:$in => ['bar']})
-    end
-
-    let(:modified) do
-      base.add_field_expression('foo', {:$in => ['zoom']})
-    end
-
-    it 'adds the new condition using $and' do
-      modified.selector.should == {
-        'foo' => {:$in => ['bar']},
-        '$and' => ['foo' => {:$in => ['zoom']}]
-      }
-    end
   end
-end
 
   describe '#add_operator_expression' do
     let(:query_method) { :add_operator_expression }

data/spec/mongoid/criteria_projection_spec.rb

@@ -154,6 +154,7 @@ describe Mongoid::Criteria do
     end
 
     context 'when the field is localized' do
+      with_default_i18n_configs
 
       before do
         I18n.locale = :en
@@ -163,10 +164,6 @@ describe Mongoid::Criteria do
         d.save!
       end
 
-      after do
-        I18n.locale = :en
-      end
-
       context 'when entire field is included' do
 
         let(:dictionary) do

data/spec/mongoid/criteria_spec.rb

@@ -1953,6 +1953,7 @@ describe Mongoid::Criteria do
     end
 
     context 'when plucking a localized field' do
+      with_default_i18n_configs
 
       before do
         I18n.locale = :en
@@ -1962,10 +1963,6 @@ describe Mongoid::Criteria do
         d.save!
       end
 
-      after do
-        I18n.locale = :en
-      end
-
       context 'when plucking the entire field' do
         let(:plucked) do
           Dictionary.all.pluck(:description)
@@ -2059,13 +2056,10 @@ describe Mongoid::Criteria do
       end
 
       context 'when fallbacks are enabled with a locale list' do
-        with_i18n_fallbacks
+        require_fallbacks
 
-        around(:all) do |example|
-          prev_fallbacks = I18n.fallbacks.dup
+        before do
           I18n.fallbacks[:he] = [ :en ]
-          example.run
-          I18n.fallbacks = prev_fallbacks
         end
 
         let(:plucked) do
@@ -2093,6 +2087,8 @@ describe Mongoid::Criteria do
       end
 
       context "when the localized field is embedded" do
+        with_default_i18n_configs
+
         before do
           p = Passport.new
           I18n.locale = :en

data/spec/mongoid/document_spec.rb

@@ -591,33 +591,6 @@ describe Mongoid::Document do
       expect(person.as_document["addresses"].first).to have_key(:locations)
     end
 
-    context 'when modifying the returned object' do
-      let(:record) do
-        RootCategory.create(categories: [{ name: 'tests' }]).reload
-      end
-
-      shared_examples_for 'an object with protected internal state' do
-        it 'does not expose internal state' do
-          before_change = record.as_document.dup
-          record.categories.first.name = 'things'
-          after_change = record.as_document
-          expect(before_change['categories'].first['name']).not_to eq('things')
-        end
-      end
-
-      context 'when legacy_attributes is true' do
-        config_override :legacy_attributes, true
-
-        it_behaves_like 'an object with protected internal state'
-      end
-
-      context 'when legacy_attributes is false' do
-        config_override :legacy_attributes, false
-
-        it_behaves_like 'an object with protected internal state'
-      end
-    end
-
     context "with relation define store_as option in embeded_many" do
 
       let!(:phone) do

data/spec/mongoid/errors/readonly_document_spec.rb

@@ -12,13 +12,13 @@ describe Mongoid::Errors::ReadonlyDocument do
 
     it "contains the problem in the message" do
       expect(error.message).to include(
-        "Attempted to persist the readonly document 'Band'."
+        "Attempted to persist a readonly document of class 'Band'."
       )
     end
 
     it "contains the summary in the message" do
       expect(error.message).to include(
-        "Documents loaded from the database using #only"
+        "Documents that are marked readonly cannot be persisted"
       )
     end
 

data/spec/mongoid/extensions/hash_spec.rb

@@ -178,7 +178,7 @@ describe Mongoid::Extensions::Hash do
 
         it "moves the non hash values under the provided key" do
           expect(consolidated).to eq({
-            "$set" => { 'name' => "Tool", likes: 10 }, "$inc" => { 'plays' => 1 }
+            "$set" => { name: "Tool", likes: 10 }, "$inc" => { plays: 1 }
           })
         end
       end
@@ -195,7 +195,7 @@ describe Mongoid::Extensions::Hash do
 
         it "moves the non hash values under the provided key" do
           expect(consolidated).to eq({
-            "$set" => { likes: 10, 'name' => "Tool" }, "$inc" => { 'plays' => 1 }
+            "$set" => { likes: 10, name: "Tool" }, "$inc" => { plays: 1 }
           })
         end
       end
@@ -213,7 +213,7 @@ describe Mongoid::Extensions::Hash do
 
       it "moves the non hash values under the provided key" do
         expect(consolidated).to eq({
-          "$set" => { likes: 10, name: "Tool" }, "$inc" => { 'plays' => 1 }
+          "$set" => { likes: 10, name: "Tool" }, "$inc" => { plays: 1 }
         })
       end
     end

data/spec/mongoid/extensions/time_spec.rb

@@ -50,14 +50,7 @@ describe Mongoid::Extensions::Time do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
-
-        before do
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
+        time_zone_override "Stockholm"
 
         context "when demongoizing a Time" do
 
@@ -123,19 +116,12 @@ describe Mongoid::Extensions::Time do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
+        time_zone_override "Stockholm"
 
         let(:time) do
           Time.utc(2010, 11, 19, 0, 30)
         end
 
-        before do
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
-
         it "returns utc" do
           expect(Time.demongoize(time)).to eq(
             ActiveSupport::TimeZone['UTC'].local(2010, 11, 19, 0, 30)
@@ -855,20 +841,13 @@ describe Mongoid::Extensions::Time do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
+        # if this is actually your time zone, the following tests are useless
+        time_zone_override "Stockholm"
 
         let(:datetime) do
           DateTime.new(2010, 11, 19)
         end
 
-        before do
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
-
         it "assumes the given time is local" do
           expect(Time.mongoize(datetime)).to eq(
             Time.utc(2010, 11, 19)
@@ -945,20 +924,13 @@ describe Mongoid::Extensions::Time do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
+        # if this is actually your time zone, the following tests are useless
+        time_zone_override "Stockholm"
 
         let(:date) do
           Date.new(2010, 11, 19)
         end
 
-        before do
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
-
         it "assumes the given time is local" do
           expect(Time.mongoize(date)).to eq(Time.utc(2010, 11, 18, 23))
         end
@@ -977,15 +949,8 @@ describe Mongoid::Extensions::Time do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
-
-        before do
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
+        # if this is actually your time zone, the following tests are useless
+        time_zone_override "Stockholm"
 
         it "assumes the given time is local" do
           expect(Time.mongoize(array)).to eq(

data/spec/mongoid/extensions/time_with_zone_spec.rb

@@ -50,14 +50,7 @@ describe Mongoid::Extensions::TimeWithZone do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
-
-        before do
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
+        time_zone_override "Stockholm"
 
         it "returns an ActiveSupport::TimeWithZone" do
           expect(ActiveSupport::TimeWithZone.demongoize(time).class).to eq(ActiveSupport::TimeWithZone)
@@ -113,19 +106,12 @@ describe Mongoid::Extensions::TimeWithZone do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
+        time_zone_override "Stockholm"
 
         let(:time) do
           Time.utc(2010, 11, 19, 0, 30)
         end
 
-        before do
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
-
         it "returns utc" do
           expect(ActiveSupport::TimeWithZone.demongoize(time)).to eq(
             ActiveSupport::TimeZone['UTC'].local(2010, 11, 19, 0, 30)
@@ -203,15 +189,8 @@ describe Mongoid::Extensions::TimeWithZone do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
-
-        before do
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
+        # if this is actually your time zone, the following tests are useless
+        time_zone_override "Stockholm"
 
         context "when the local time is not observing daylight saving" do
 
@@ -247,20 +226,12 @@ describe Mongoid::Extensions::TimeWithZone do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
+        time_zone_override "Stockholm"
 
         let(:datetime) do
           DateTime.new(2010, 11, 19)
         end
 
-        before do
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
-
         it "assumes the given time is local" do
           expect(ActiveSupport::TimeWithZone.mongoize(datetime)).to eq(
             Time.utc(2010, 11, 19)
@@ -317,20 +288,12 @@ describe Mongoid::Extensions::TimeWithZone do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
+        time_zone_override "Stockholm"
 
         let(:date) do
           Date.new(2010, 11, 19)
         end
 
-        before do
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
-
         it "assumes the given time is local" do
           expect(ActiveSupport::TimeWithZone.mongoize(date)).to eq(Time.utc(2010, 11, 18, 23))
         end
@@ -349,15 +312,7 @@ describe Mongoid::Extensions::TimeWithZone do
 
       context "when using the ActiveSupport time zone" do
         config_override :use_activesupport_time_zone, true
-
-        before do
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-        end
+        time_zone_override "Stockholm"
 
         it "assumes the given time is local" do
           expect(ActiveSupport::TimeWithZone.mongoize(array)).to eq(