mongoid 3.1.5 → 8.0.2

data/spec/mongoid/extensions/time_spec.rb

@@ -1,23 +1,17 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Extensions::Time 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)
     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
 
@@ -26,7 +20,7 @@ describe Mongoid::Extensions::Time do
         end
 
         it "returns the local time" do
-          Time.demongoize(time).utc_offset.should eq(
+          expect(Time.demongoize(time).utc_offset).to eq(
             Time.local(2010, 11, 19).utc_offset
           )
         end
@@ -39,7 +33,7 @@ describe Mongoid::Extensions::Time do
         end
 
         it "returns the local time" do
-          Time.demongoize(time).should eq(time.getlocal)
+          expect(Time.demongoize(time)).to eq(time.getlocal)
         end
       end
 
@@ -50,24 +44,33 @@ describe Mongoid::Extensions::Time do
         end
 
         it "changes it back to the equivalent local time" do
-          Time.demongoize(time).should eq(time)
+          expect(Time.demongoize(time)).to eq(time)
         end
       end
 
       context "when using the ActiveSupport time zone" do
+        config_override :use_activesupport_time_zone, true
 
         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 an ActiveSupport::TimeWithZone" do
-          Time.demongoize(time).class.should eq(ActiveSupport::TimeWithZone)
+        context "when demongoizing a Time" do
+
+          it "returns an ActiveSupport::TimeWithZone" do
+            expect(Time.demongoize(time).class).to eq(ActiveSupport::TimeWithZone)
+          end
+        end
+
+        context "when demongoizing a Date" do
+
+          it "returns an ActiveSupport::TimeWithZone" do
+            expect(Time.demongoize(Date.today).class).to eq(ActiveSupport::TimeWithZone)
+          end
         end
 
         context "when the local time is not observing daylight saving" do
@@ -77,7 +80,7 @@ describe Mongoid::Extensions::Time do
           end
 
           it "returns the local time" do
-            Time.demongoize(new_time).should eq(
+            expect(Time.demongoize(new_time)).to eq(
               Time.zone.local(2010, 11, 19, 13)
             )
           end
@@ -90,7 +93,7 @@ describe Mongoid::Extensions::Time do
           end
 
           it "returns the local time" do
-            Time.demongoize(new_time).should eq(
+            expect(Time.demongoize(new_time)).to eq(
               Time.zone.local(2010, 9, 19, 14)
             )
           end
@@ -103,7 +106,7 @@ describe Mongoid::Extensions::Time do
           end
 
           it "change it back to the equivalent local time" do
-            Time.demongoize(new_time).should eq(
+            expect(Time.demongoize(new_time)).to eq(
               Time.zone.local(2010, 11, 19, 1, 30)
             )
           end
@@ -112,43 +115,35 @@ describe Mongoid::Extensions::Time 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
-        Time.demongoize(time.dup.utc).utc_offset.should eq(0)
+        expect(Time.demongoize(time.dup.utc).utc_offset).to eq(0)
       end
 
       context "when using the ActiveSupport time zone" do
+        config_override :use_activesupport_time_zone, true
 
         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
-          Time.demongoize(time).should eq(
+          expect(Time.demongoize(time)).to eq(
             ActiveSupport::TimeZone['UTC'].local(2010, 11, 19, 0, 30)
           )
         end
 
         it "returns an ActiveSupport::TimeWithZone" do
-          Time.demongoize(time).class.should eq(
+          expect(Time.demongoize(time).class).to eq(
             ActiveSupport::TimeWithZone
           )
         end
@@ -158,7 +153,331 @@ describe Mongoid::Extensions::Time do
     context "when time is nil" do
 
       it "returns nil" do
-        Time.demongoize(nil).should be_nil
+        expect(Time.demongoize(nil)).to be_nil
+      end
+    end
+
+    context "when the value is uncastable" do
+
+      it "returns nil" do
+        expect(Time.demongoize("bogus")).to be_nil
+      end
+    end
+
+    context "when the value is a string" do
+
+      context "when use_utc is false" do
+        config_override :use_utc, false
+
+        context "when using active support's time zone" do
+          include_context 'using AS time zone'
+
+          context "when the string is a valid time with time zone" do
+
+            let(:string) do
+              # JST is +0900
+              "2010-11-19 00:24:49.123457 +1100"
+            end
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
+
+            it "converts to the AS time zone" do
+              expect(mongoized.zone).to eq("JST")
+            end
+
+            it_behaves_like 'mongoizes to AS::TimeWithZone'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457"
+            end
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 15:24:49.123457 +0000").in_time_zone }
+
+            it "converts to the AS time zone" do
+              expect(mongoized.zone).to eq("JST")
+            end
+
+            it_behaves_like 'mongoizes to AS::TimeWithZone'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time" do
+
+            let(:string) do
+              "2010-11-19"
+            end
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 15:00:00 +0000").in_time_zone }
+
+            it "converts to the AS time zone" do
+              expect(mongoized.zone).to eq("JST")
+            end
+
+            it_behaves_like 'mongoizes to AS::TimeWithZone'
+          end
+
+          context "when the string is an invalid time" do
+
+            let(:string) do
+              "bogus"
+            end
+
+            it "returns nil" do
+              expect(Time.demongoize(string)).to be_nil
+            end
+          end
+        end
+
+        context "when not using active support's time zone" do
+          include_context 'not using AS time zone'
+
+          context "when the string is a valid time with time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457 +1100"
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457"
+            end
+
+            let(:utc_offset) do
+              Time.now.utc_offset
+            end
+
+            let(:expected_time) { Time.parse("2010-11-19 00:24:49.123457 +0000") - Time.parse(string).utc_offset }
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            it 'test operates in multiple time zones' do
+              expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time" do
+
+            let(:string) do
+              "2010-11-19"
+            end
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            let(:utc_offset) do
+              Time.now.utc_offset
+            end
+
+            let(:expected_time) { Time.parse("2010-11-19 00:00:00 +0000") - Time.parse(string).utc_offset }
+
+            it 'test operates in multiple time zones' do
+              expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+          end
+
+          context "when the string is an invalid time" do
+
+            let(:string) do
+              "bogus"
+            end
+
+            it "returns nil" do
+              expect(Time.demongoize(string)).to be_nil
+            end
+          end
+        end
+      end
+
+      context "when use_utc is true" do
+        config_override :use_utc, true
+
+        context "when using active support's time zone" do
+          include_context 'using AS time zone'
+
+          context "when the string is a valid time with time zone" do
+
+            let(:string) do
+              # JST is +0900
+              "2010-11-19 00:24:49.123457 +1100"
+            end
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+
+            it_behaves_like 'mongoizes to AS::TimeWithZone'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457"
+            end
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 15:24:49.123457 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+
+            it_behaves_like 'mongoizes to AS::TimeWithZone'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time" do
+
+            let(:string) do
+              "2010-11-19"
+            end
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 15:00:00 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+
+            it_behaves_like 'mongoizes to AS::TimeWithZone'
+          end
+
+          context "when the string is an invalid time" do
+
+            let(:string) do
+              "bogus"
+            end
+
+            it "returns nil" do
+              expect(Time.demongoize(string)).to be_nil
+            end
+          end
+        end
+
+        context "when not using active support's time zone" do
+          include_context 'not using AS time zone'
+
+          context "when the string is a valid time with time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457 +1100"
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457"
+            end
+
+            let(:utc_offset) do
+              Time.now.utc_offset
+            end
+
+            let(:expected_time) { Time.parse("2010-11-19 00:24:49.123457 +0000") - Time.parse(string).utc_offset }
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            it 'test operates in multiple time zones' do
+              expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time" do
+
+            let(:string) do
+              "2010-11-19"
+            end
+
+            let(:mongoized) do
+              Time.demongoize(string)
+            end
+
+            let(:utc_offset) do
+              Time.now.utc_offset
+            end
+
+            let(:expected_time) { Time.parse("2010-11-19 00:00:00 +0000") - Time.parse(string).utc_offset }
+
+            it 'test operates in multiple time zones' do
+              expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+          end
+
+          context "when the string is an invalid time" do
+
+            let(:string) do
+              "bogus"
+            end
+
+            it "returns nil" do
+              expect(Time.demongoize(string)).to be_nil
+            end
+          end
+        end
       end
     end
   end
@@ -172,75 +491,325 @@ describe Mongoid::Extensions::Time do
     context "when given nil" do
 
       it "returns nil" do
-        Time.mongoize(nil).should be_nil
+        expect(Time.mongoize(nil)).to be_nil
       end
     end
 
     context "when string is empty" do
 
+      let(:mongoized) do
+        Time.mongoize("")
+      end
+
       it "returns nil" do
-        Time.mongoize("").should be_nil
+        expect(mongoized).to be_nil
       end
     end
 
-    context "when given a string" do
+    context "when the value is a string" do
 
-      context "when the string is a valid time" do
+      context "when use_utc is false" do
+        config_override :use_utc, false
 
-        it "converts to a utc time" do
-          Time.mongoize(time.to_s).utc_offset.should eq(0)
-        end
+        context "when using active support's time zone" do
+          include_context 'using AS time zone'
 
-        it "serializes with time parsing" do
-          Time.mongoize(time.to_s).should eq(Time.parse(time.to_s).utc)
-        end
+          context "when the string is a valid time with time zone" do
 
-        it "returns a local date from the string" do
-          Time.mongoize(time.to_s).should eq(
-            Time.local(time.year, time.month, time.day, time.hour, time.min, time.sec)
-          )
-        end
-      end
+            let(:string) do
+              # JST is +0900
+              "2010-11-19 00:24:49.123457 +1100"
+            end
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457"
+            end
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 15:24:49.123457 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time" do
+
+            let(:string) do
+              "2010-11-19"
+            end
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 15:00:00 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+          end
+
+          context "when the string is an invalid time" do
 
-      context "when the string is an invalid time" do
+            let(:string) do
+              "bogus"
+            end
 
-        let(:epoch) do
-          Time.utc(1970, 1, 1, 0, 0, 0, 0)
+            it "returns nil" do
+              expect(Time.mongoize(string)).to be_nil
+            end
+          end
         end
 
-        it "converts the time to epoch" do
-          Time.mongoize("time").should eq(epoch)
+        context "when not using active support's time zone" do
+          include_context 'not using AS time zone'
+
+          context "when the string is a valid time with time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457 +1100"
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457"
+            end
+
+            let(:utc_offset) do
+              Time.now.utc_offset
+            end
+
+            let(:expected_time) { Time.parse("2010-11-19 00:24:49.123457 +0000") - Time.parse(string).utc_offset }
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            it 'test operates in multiple time zones' do
+              expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time" do
+
+            let(:string) do
+              "2010-11-19"
+            end
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            let(:utc_offset) do
+              Time.now.utc_offset
+            end
+
+            let(:expected_time) { Time.parse("2010-11-19 00:00:00 +0000") - Time.parse(string).utc_offset }
+
+            it 'test operates in multiple time zones' do
+              expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+          end
+
+          context "when the string is an invalid time" do
+
+            let(:string) do
+              "bogus"
+            end
+
+            it "returns nil" do
+              expect(Time.mongoize(string)).to be_nil
+            end
+          end
         end
       end
 
-      context "when using the ActiveSupport time zone" do
+      context "when use_utc is true" do
+        config_override :use_utc, true
 
-        before do
-          Mongoid.use_activesupport_time_zone = true
-          # if this is actually your time zone, the following tests are useless
-          Time.zone = "Stockholm"
-        end
+        context "when using active support's time zone" do
+          include_context 'using AS time zone'
 
-        after do
-          Time.zone = nil
-          Mongoid.use_activesupport_time_zone = false
-        end
+          context "when the string is a valid time with time zone" do
 
-        context "when the local time is not observing daylight saving" do
+            let(:string) do
+              # JST is +0900
+              "2010-11-19 00:24:49.123457 +1100"
+            end
 
-          it "returns the local time" do
-            Time.mongoize('2010-11-19 5:00:00').should eq(
-              Time.utc(2010, 11, 19, 4)
-            )
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457"
+            end
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 15:24:49.123457 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time" do
+
+            let(:string) do
+              "2010-11-19"
+            end
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 15:00:00 +0000").in_time_zone }
+
+            it "converts to UTC" do
+              expect(mongoized.zone).to eq("UTC")
+            end
+          end
+
+          context "when the string is an invalid time" do
+
+            let(:string) do
+              "bogus"
+            end
+
+            it "returns nil" do
+              expect(Time.mongoize(string)).to be_nil
+            end
           end
         end
 
-        context "when the local time is observing daylight saving" do
+        context "when not using active support's time zone" do
+          include_context 'not using AS time zone'
 
-          it "returns the local time" do
-            Time.mongoize('2010-9-19 5:00:00').should eq(
-              Time.utc(2010, 9, 19, 3)
-            )
+          context "when the string is a valid time with time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457 +1100"
+            end
+
+            let(:expected_time) { Time.parse("2010-11-18 13:24:49.123457 +0000").in_time_zone }
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time zone" do
+
+            let(:string) do
+              "2010-11-19 00:24:49.123457"
+            end
+
+            let(:utc_offset) do
+              Time.now.utc_offset
+            end
+
+            let(:expected_time) { Time.parse("2010-11-19 00:24:49.123457 +0000") - Time.parse(string).utc_offset }
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            it 'test operates in multiple time zones' do
+              expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+            it_behaves_like 'maintains precision when mongoized'
+          end
+
+          context "when the string is a valid time without time" do
+
+            let(:string) do
+              "2010-11-19"
+            end
+
+            let(:mongoized) do
+              Time.mongoize(string)
+            end
+
+            let(:utc_offset) do
+              Time.now.utc_offset
+            end
+
+            let(:expected_time) { Time.parse("2010-11-19 00:00:00 +0000") - Time.parse(string).utc_offset }
+
+            it 'test operates in multiple time zones' do
+              expect(utc_offset).not_to eq(Time.zone.now.utc_offset)
+            end
+
+            it_behaves_like 'mongoizes to Time'
+          end
+
+          context "when the string is an invalid time" do
+
+            let(:string) do
+              "bogus"
+            end
+
+            it "returns nil" do
+              expect(Time.mongoize(string)).to be_nil
+            end
           end
         end
       end
@@ -261,66 +830,65 @@ describe Mongoid::Extensions::Time do
       end
 
       it "doesn't strip milli- or microseconds" do
-        Time.mongoize(time).to_f.round(3).should eq(time.to_f.round(3))
+        expect(Time.mongoize(time).to_f).to eq(time.to_time.to_f)
       end
 
       it "doesn't round up the hour at end of month" do
-        eom_time_mongoized.hour.should eq(eom_time.utc.hour)
+        expect(eom_time_mongoized.hour).to eq(eom_time.utc.hour)
       end
 
       it "doesn't round up the minute" do
-        eom_time_mongoized.min.should eq(eom_time.utc.min)
+        expect(eom_time_mongoized.min).to eq(eom_time.utc.min)
       end
 
       it "doesn't round up the seconds" do
-        eom_time_mongoized.sec.should eq(eom_time.utc.sec)
+        expect(eom_time_mongoized.sec).to eq(eom_time.utc.sec)
       end
 
       it "does not alter seconds" do
-        (eom_time_mongoized.usec).should eq(999999)
+        expect((eom_time_mongoized.usec)).to eq(999999)
       end
 
       it "does not alter seconds with fractions" do
-        DateTime.mongoize(11.11).to_f.should eq(11.11)
+        expect(DateTime.mongoize(1.11).to_f).to eq(1.11)
       end
 
       context "when using the ActiveSupport time zone" do
+        config_override :use_activesupport_time_zone, true
 
         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
-          Time.mongoize(datetime).should eq(
+          expect(Time.mongoize(datetime)).to eq(
             Time.utc(2010, 11, 19)
           )
         end
 
         it "doesn't round up the hour" do
-          eom_time_mongoized.hour.should eq(eom_time.utc.hour)
+          expect(eom_time_mongoized.hour).to eq(eom_time.utc.hour)
         end
 
         it "doesn't round up the minutes" do
-          eom_time_mongoized.min.should eq(eom_time.utc.min)
+          expect(eom_time_mongoized.min).to eq(eom_time.utc.min)
         end
 
         it "doesn't round up the seconds" do
-          eom_time_mongoized.sec.should eq(eom_time.utc.sec)
+          expect(eom_time_mongoized.sec).to eq(eom_time.utc.sec)
         end
 
         it "does not alter the seconds" do
-          (eom_time_mongoized.usec).should eq(999999)
+          expect((eom_time_mongoized.usec)).to eq(999999)
         end
       end
     end
@@ -328,23 +896,23 @@ describe Mongoid::Extensions::Time do
     context "when given a Time" do
 
       it "converts to a utc time" do
-        Time.mongoize(time).utc_offset.should eq(0)
+        expect(Time.mongoize(time).utc_offset).to eq(0)
       end
 
       it "returns utc times unchanged" do
-        Time.mongoize(time.utc).should eq(time.utc)
+        expect(Time.mongoize(time.utc)).to eq(time.utc)
       end
 
       it "returns the time as utc" do
-        Time.mongoize(time).should eq(time.utc)
+        expect(Time.mongoize(time)).to eq(time.utc)
       end
 
       it "doesn't strip milli- or microseconds" do
-        Time.mongoize(time).to_f.should eq(time.to_f)
+        expect(Time.mongoize(time).to_f).to eq(time.to_f)
       end
 
       it "does not alter seconds with fractions" do
-        Time.mongoize(102.63).to_f.should eq(102.63)
+        expect(Time.mongoize(102.25).to_f).to eq(102.25)
       end
     end
 
@@ -355,7 +923,7 @@ describe Mongoid::Extensions::Time do
       end
 
       it "converts it to utc" do
-        Time.mongoize(time.in_time_zone("Alaska")).should eq(
+        expect(Time.mongoize(time.in_time_zone("Alaska"))).to eq(
           Time.at(time.to_i).utc
         )
       end
@@ -368,32 +936,31 @@ describe Mongoid::Extensions::Time do
       end
 
       it "converts to a utc time" do
-        Time.mongoize(date).should eq(Time.local(date.year, date.month, date.day))
+        expect(Time.mongoize(date)).to eq(Time.local(date.year, date.month, date.day))
       end
 
       it "has a zero utc offset" do
-        Time.mongoize(date).utc_offset.should eq(0)
+        expect(Time.mongoize(date).utc_offset).to eq(0)
       end
 
       context "when using the ActiveSupport time zone" do
+        config_override :use_activesupport_time_zone, true
 
         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
-          Time.mongoize(date).should eq(Time.utc(2010, 11, 18, 23))
+          expect(Time.mongoize(date)).to eq(Time.utc(2010, 11, 18, 23))
         end
       end
     end
@@ -405,24 +972,23 @@ describe Mongoid::Extensions::Time do
       end
 
       it "returns a time" do
-        Time.mongoize(array).should eq(Time.local(*array))
+        expect(Time.mongoize(array)).to eq(Time.local(*array))
       end
 
       context "when using the ActiveSupport time zone" do
+        config_override :use_activesupport_time_zone, true
 
         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
-          Time.mongoize(array).should eq(
+          expect(Time.mongoize(array)).to eq(
             Time.utc(2010, 11, 18, 23, 24, 49)
           )
         end
@@ -445,23 +1011,50 @@ describe Mongoid::Extensions::Time do
     end
 
     it "converts to a utc time" do
-      time.mongoize.utc_offset.should eq(0)
+      expect(time.mongoize.utc_offset).to eq(0)
     end
 
     it "returns the time as utc" do
-      time.mongoize.should eq(time.utc)
+      expect(time.mongoize).to eq(time.utc)
     end
 
     it "doesn't strip milli- or microseconds" do
-      time.mongoize.to_f.should eq(time.to_f)
+      expect(time.mongoize.to_f).to eq(time.to_f)
     end
 
     it "doesn't round up at end of month" do
-      eom_time_mongoized.hour.should eq(eom_time.utc.hour)
-      eom_time_mongoized.min.should eq(eom_time.utc.min)
-      eom_time_mongoized.sec.should eq(eom_time.utc.sec)
-      eom_time_mongoized.usec.should eq(eom_time.utc.usec)
-      eom_time_mongoized.subsec.to_f.round(3).should eq(eom_time.utc.subsec.to_f.round(3))
+      expect(eom_time_mongoized.hour).to eq(eom_time.utc.hour)
+      expect(eom_time_mongoized.min).to eq(eom_time.utc.min)
+      expect(eom_time_mongoized.sec).to eq(eom_time.utc.sec)
+      expect(eom_time_mongoized.usec).to eq(eom_time.utc.usec)
+      expect(eom_time_mongoized.subsec.to_f.round(3)).to eq(eom_time.utc.subsec.to_f.round(3))
+    end
+  end
+
+  describe "__mongoize_time__" do
+
+    let(:time) do
+      Time.at(1543331265.123457)
+    end
+
+    let(:mongoized) do
+      time.__mongoize_time__
+    end
+
+    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 Time'
+      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'
+
+      it_behaves_like 'mongoizes to Time'
+      it_behaves_like 'maintains precision when mongoized'
     end
   end
 end