mongoid 7.2.1 → 9.0.0

data/spec/mongoid/extensions/time_with_zone_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -7,20 +7,12 @@ describe Mongoid::Extensions::TimeWithZone do
 
   describe ".demongoize" do
 
-    after(:all) do
-      Mongoid.use_utc = false
-      Mongoid.use_activesupport_time_zone = true
-    end
-
     let!(:time) do
-      Time.local(2010, 11, 19)
+      Time.zone.local(2010, 11, 19)
     end
 
     context "when the time zone is not defined" do
-
-      before do
-        Mongoid.use_utc = false
-      end
+      config_override :use_utc, false
 
       context "when the local time is not observing daylight saving" do
 
@@ -30,7 +22,7 @@ describe Mongoid::Extensions::TimeWithZone do
 
         it "returns the local time" do
           expect(ActiveSupport::TimeWithZone.demongoize(time).utc_offset).to eq(
-            Time.local(2010, 11, 19).utc_offset
+            Time.zone.local(2010, 11, 19).utc_offset
           )
         end
       end
@@ -49,7 +41,7 @@ describe Mongoid::Extensions::TimeWithZone do
       context "when we have a time close to midnight" do
 
         let(:time) do
-          Time.local(2010, 11, 19, 0, 30).utc
+          Time.zone.local(2010, 11, 19, 0, 30).utc
         end
 
         it "changes it back to the equivalent local time" do
@@ -57,17 +49,8 @@ describe Mongoid::Extensions::TimeWithZone do
         end
       end
 
-      context "when using the ActiveSupport time zone" do
-
-        before do
-          Mongoid.use_activesupport_time_zone = true
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-          Mongoid.use_activesupport_time_zone = false
-        end
+      context "when setting ActiveSupport time zone" do
+        time_zone_override "Stockholm"
 
         it "returns an ActiveSupport::TimeWithZone" do
           expect(ActiveSupport::TimeWithZone.demongoize(time).class).to eq(ActiveSupport::TimeWithZone)
@@ -115,35 +98,19 @@ describe Mongoid::Extensions::TimeWithZone do
     end
 
     context "when the time zone is defined as UTC" do
-
-      before do
-        Mongoid.use_utc = true
-      end
-
-      after do
-        Mongoid.use_utc = false
-      end
+      config_override :use_utc, true
 
       it "returns utc" do
         expect(ActiveSupport::TimeWithZone.demongoize(time.dup.utc).utc_offset).to eq(0)
       end
 
-      context "when using the ActiveSupport time zone" do
+      context "when setting ActiveSupport time zone" do
+        time_zone_override "Stockholm"
 
         let(:time) do
           Time.utc(2010, 11, 19, 0, 30)
         end
 
-        before do
-          Mongoid.use_activesupport_time_zone = true
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-          Mongoid.use_activesupport_time_zone = false
-        end
-
         it "returns utc" do
           expect(ActiveSupport::TimeWithZone.demongoize(time)).to eq(
             ActiveSupport::TimeZone['UTC'].local(2010, 11, 19, 0, 30)
@@ -169,7 +136,7 @@ describe Mongoid::Extensions::TimeWithZone do
   describe ".mongoize" do
 
     let!(:time) do
-      Time.local(2010, 11, 19)
+      Time.zone.local(2010, 11, 19)
     end
 
     context "when given nil" do
@@ -181,8 +148,12 @@ describe Mongoid::Extensions::TimeWithZone do
 
     context "when string is empty" do
 
+      let(:mongoized) do
+        ActiveSupport::TimeWithZone.mongoize("")
+      end
+
       it "returns nil" do
-        expect(ActiveSupport::TimeWithZone.mongoize("")).to be_nil
+        expect(mongoized).to be_nil
       end
     end
 
@@ -200,30 +171,23 @@ describe Mongoid::Extensions::TimeWithZone do
 
         it "returns a local date from the string" do
           expect(ActiveSupport::TimeWithZone.mongoize(time.to_s)).to eq(
-            Time.local(time.year, time.month, time.day, time.hour, time.min, time.sec)
+            Time.zone.local(time.year, time.month, time.day, time.hour, time.min, time.sec)
           )
         end
       end
 
       context "when the string is an invalid time" do
+        let(:mongoized) do
+          ActiveSupport::TimeWithZone.mongoize("time")
+        end
 
         it "returns nil" do
-          expect(ActiveSupport::TimeWithZone.mongoize("time")).to eq(nil)
+          expect(mongoized).to be_nil
         end
       end
 
-      context "when using the ActiveSupport time zone" do
-
-        before do
-          Mongoid.use_activesupport_time_zone = true
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-          Mongoid.use_activesupport_time_zone = false
-        end
+      context "when setting ActiveSupport time zone" do
+        time_zone_override "Stockholm"
 
         context "when the local time is not observing daylight saving" do
 
@@ -257,23 +221,13 @@ describe Mongoid::Extensions::TimeWithZone do
         )
       end
 
-      context "when using the ActiveSupport time zone" do
+      context "when setting ActiveSupport time zone" do
+        time_zone_override "Stockholm"
 
         let(:datetime) do
           DateTime.new(2010, 11, 19)
         end
 
-        before do
-          Mongoid.use_activesupport_time_zone = true
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-          Mongoid.use_activesupport_time_zone = false
-        end
-
         it "assumes the given time is local" do
           expect(ActiveSupport::TimeWithZone.mongoize(datetime)).to eq(
             Time.utc(2010, 11, 19)
@@ -321,30 +275,20 @@ describe Mongoid::Extensions::TimeWithZone do
       end
 
       it "converts to a utc time" do
-        expect(ActiveSupport::TimeWithZone.mongoize(date)).to eq(Time.local(date.year, date.month, date.day))
+        expect(ActiveSupport::TimeWithZone.mongoize(date)).to eq(Time.zone.local(date.year, date.month, date.day))
       end
 
       it "has a zero utc offset" do
         expect(ActiveSupport::TimeWithZone.mongoize(date).utc_offset).to eq(0)
       end
 
-      context "when using the ActiveSupport time zone" do
+      context "when setting ActiveSupport time zone" do
+        time_zone_override "Stockholm"
 
         let(:date) do
           Date.new(2010, 11, 19)
         end
 
-        before do
-          Mongoid.use_activesupport_time_zone = true
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-          Mongoid.use_activesupport_time_zone = false
-        end
-
         it "assumes the given time is local" do
           expect(ActiveSupport::TimeWithZone.mongoize(date)).to eq(Time.utc(2010, 11, 18, 23))
         end
@@ -358,21 +302,11 @@ describe Mongoid::Extensions::TimeWithZone do
       end
 
       it "returns a time" do
-        expect(ActiveSupport::TimeWithZone.mongoize(array)).to eq(Time.local(*array))
+        expect(ActiveSupport::TimeWithZone.mongoize(array)).to eq(Time.zone.local(*array))
       end
 
-      context "when using the ActiveSupport time zone" do
-
-        before do
-          Mongoid.use_activesupport_time_zone = true
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
-
-        after do
-          Time.zone = nil
-          Mongoid.use_activesupport_time_zone = false
-        end
+      context "when setting ActiveSupport time zone" do
+        time_zone_override "Stockholm"
 
         it "assumes the given time is local" do
           expect(ActiveSupport::TimeWithZone.mongoize(array)).to eq(
@@ -386,7 +320,7 @@ describe Mongoid::Extensions::TimeWithZone do
   describe "#mongoize" do
 
     let!(:time) do
-      Time.local(2010, 11, 19)
+      Time.zone.local(2010, 11, 19)
     end
 
     it "converts to a utc time" do
@@ -418,15 +352,8 @@ describe Mongoid::Extensions::TimeWithZone do
 
     let(:expected_time) { time.in_time_zone }
 
-    context "when using active support's time zone" do
-      include_context 'using AS time zone'
-
-      it_behaves_like 'mongoizes to AS::TimeWithZone'
-      it_behaves_like 'maintains precision when mongoized'
-    end
-
-    context "when not using active support's time zone" do
-      include_context 'not using AS time zone'
+    context "when setting ActiveSupport time zone" do
+      include_context 'setting ActiveSupport time zone'
 
       it_behaves_like 'mongoizes to AS::TimeWithZone'
       it_behaves_like 'maintains precision when mongoized'

data/spec/mongoid/extensions/true_class_spec.rb

@@ -1,23 +1,16 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
 describe Mongoid::Extensions::TrueClass do
 
-  describe "#__sortable__" do
-
-    it "returns 1" do
-      expect(true.__sortable__).to eq(1)
-    end
-  end
-
   describe "#is_a?" do
 
     context "when provided a Boolean" do
 
       it "returns true" do
-        expect(true.is_a?(Boolean)).to be true
+        expect(true.is_a?(Mongoid::Boolean)).to be true
       end
     end
 

data/spec/mongoid/factory_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -221,6 +221,7 @@ describe Mongoid::Factory do
         end
 
         it "sets the attributes to _type only" do
+          skip 'https://jira.mongodb.org/browse/MONGOID-5179'
           # Note that Address provides the _id override.
           document.attributes.should == {'_type' => 'Address'}
         end
@@ -449,7 +450,7 @@ describe Mongoid::Factory do
 
     context 'when type is correct but the instantiation raises a NoMethodError' do
       class BadPerson < Person
-        def self.instantiate(*args)
+        def self.instantiate_document(*args)
           call_some_nonexistent_method(*args)
           super
         end
@@ -470,5 +471,65 @@ describe Mongoid::Factory do
       end
 
     end
+
+    context "when not deferring callbacks" do
+
+      let(:person) do
+        described_class.execute_from_db(Person, {}, execute_callbacks: true)
+      end
+
+      before do
+        Person.set_callback :initialize, :after do |doc|
+          doc.title = "Madam"
+        end
+
+        Person.set_callback :find, :after do |doc|
+          doc.ssn = 1234
+        end
+      end
+
+      after do
+        Person.reset_callbacks(:initialize)
+        Person.reset_callbacks(:find)
+      end
+
+      it "runs the initialize callbacks" do
+        expect(person.title).to eq("Madam")
+      end
+
+      it "runs the find callbacks" do
+        expect(person.ssn).to eq(1234)
+      end
+    end
+
+    context "when deferring callbacks" do
+
+      let(:person) do
+        described_class.execute_from_db(Person, {}, nil, nil, execute_callbacks: false)
+      end
+
+      before do
+        Person.set_callback :initialize, :after do |doc|
+          doc.title = "Madam"
+        end
+
+        Person.set_callback :find, :after do |doc|
+          doc.ssn = 1234
+        end
+      end
+
+      after do
+        Person.reset_callbacks(:initialize)
+        Person.reset_callbacks(:find)
+      end
+
+      it "runs the initialize callbacks" do
+        expect(person.title).to be nil
+      end
+
+      it "runs the find callbacks" do
+        expect(person.ssn).to be nil
+      end
+    end
   end
 end