mongoid 8.1.5 → 9.0.0

data/spec/mongoid/extensions/string_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -70,8 +71,8 @@ describe Mongoid::Extensions::String do
 
   describe "#__mongoize_time__" do
 
-    context "when using active support's time zone" do
-      include_context 'using AS time zone'
+    context "when setting ActiveSupport time zone" do
+      include_context 'setting ActiveSupport time zone'
 
       context "when the string is a valid time with time zone" do
 
@@ -146,86 +147,6 @@ describe Mongoid::Extensions::String do
         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
-          string.__mongoize_time__
-        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
-          string.__mongoize_time__
-        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
-          string.__mongoize_time__
-        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
-          "shitty string"
-        end
-
-        it "raises an error" do
-          expect {
-            string.__mongoize_time__
-          }.to raise_error(ArgumentError)
-        end
-      end
-    end
   end
 
   describe "#collectionize" do
@@ -251,37 +172,6 @@ describe Mongoid::Extensions::String do
     end
   end
 
-  describe "#mongoid_id?" do
-
-    context "when the string is id" do
-
-      it "returns true" do
-        expect("id").to be_mongoid_id
-      end
-    end
-
-    context "when the string is _id" do
-
-      it "returns true" do
-        expect("_id").to be_mongoid_id
-      end
-    end
-
-    context "when the string contains id" do
-
-      it "returns false" do
-        expect("identity").to_not be_mongoid_id
-      end
-    end
-
-    context "when the string contains _id" do
-
-      it "returns false" do
-        expect("something_id").to_not be_mongoid_id
-      end
-    end
-  end
-
   [ :mongoize, :demongoize ].each do |method|
 
     describe ".#{method}" do

data/spec/mongoid/extensions/stringified_symbol_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/mongoid/extensions/symbol_spec.rb

@@ -1,40 +1,10 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
 describe Mongoid::Extensions::Symbol do
 
-  describe "#mongoid_id?" do
-
-    context "when the string is id" do
-
-      it "returns true" do
-        expect(:id).to be_mongoid_id
-      end
-    end
-
-    context "when the string is _id" do
-
-      it "returns true" do
-        expect(:_id).to be_mongoid_id
-      end
-    end
-
-    context "when the string contains id" do
-
-      it "returns false" do
-        expect(:identity).to_not be_mongoid_id
-      end
-    end
-
-    context "when the string contains _id" do
-
-      it "returns false" do
-        expect(:something_id).to_not be_mongoid_id
-      end
-    end
-  end
-
   [ :mongoize, :demongoize ].each do |method|
 
     describe ".mongoize" do

data/spec/mongoid/extensions/time_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -7,7 +8,7 @@ describe Mongoid::Extensions::Time do
   describe ".demongoize" do
 
     let!(:time) do
-      Time.local(2010, 11, 19)
+      Time.zone.local(2010, 11, 19)
     end
 
     context "when the time zone is not defined" do
@@ -21,7 +22,7 @@ describe Mongoid::Extensions::Time do
 
         it "returns the local time" do
           expect(Time.demongoize(time).utc_offset).to eq(
-            Time.local(2010, 11, 19).utc_offset
+            Time.zone.local(2010, 11, 19).utc_offset
           )
         end
       end
@@ -40,7 +41,7 @@ describe Mongoid::Extensions::Time 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
@@ -48,8 +49,7 @@ describe Mongoid::Extensions::Time do
         end
       end
 
-      context "when using the ActiveSupport time zone" do
-        config_override :use_activesupport_time_zone, true
+      context "when setting ActiveSupport time zone" do
         time_zone_override "Stockholm"
 
         context "when demongoizing a Time" do
@@ -114,8 +114,7 @@ describe Mongoid::Extensions::Time do
         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
+      context "when setting ActiveSupport time zone" do
         time_zone_override "Stockholm"
 
         let(:time) do
@@ -150,13 +149,21 @@ describe Mongoid::Extensions::Time do
       end
     end
 
+    context "when the value is a BSON::Timestamp" do
+
+      it "returns the timestamp as a Time" do
+        expect(Time.demongoize(BSON::Timestamp.new(1000, 1)))
+          .to be == Time.at(1000)
+      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 setting ActiveSupport time zone" do
+          include_context 'setting ActiveSupport time zone'
 
           context "when the string is a valid time with time zone" do
 
@@ -229,91 +236,13 @@ describe Mongoid::Extensions::Time do
             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 setting ActiveSupport time zone" do
+          include_context 'setting ActiveSupport time zone'
 
           context "when the string is a valid time with time zone" do
 
@@ -386,84 +315,6 @@ describe Mongoid::Extensions::Time do
             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
@@ -471,7 +322,7 @@ describe Mongoid::Extensions::Time do
   describe ".mongoize" do
 
     let!(:time) do
-      Time.local(2010, 11, 19)
+      Time.zone.local(2010, 11, 19)
     end
 
     context "when given nil" do
@@ -497,8 +348,8 @@ describe Mongoid::Extensions::Time 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 setting ActiveSupport time zone" do
+          include_context 'setting ActiveSupport time zone'
 
           context "when the string is a valid time with time zone" do
 
@@ -567,91 +418,13 @@ describe Mongoid::Extensions::Time do
             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.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 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 setting ActiveSupport time zone" do
+          include_context 'setting ActiveSupport time zone'
 
           context "when the string is a valid time with time zone" do
 
@@ -720,84 +493,6 @@ describe Mongoid::Extensions::Time do
             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.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
     end
 
@@ -839,9 +534,7 @@ describe Mongoid::Extensions::Time do
         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
-        # if this is actually your time zone, the following tests are useless
+      context "when setting ActiveSupport time zone" do
         time_zone_override "Stockholm"
 
         let(:datetime) do
@@ -915,16 +608,14 @@ describe Mongoid::Extensions::Time do
       end
 
       it "converts to a utc time" do
-        expect(Time.mongoize(date)).to eq(Time.local(date.year, date.month, date.day))
+        expect(Time.mongoize(date)).to eq(Time.zone.local(date.year, date.month, date.day))
       end
 
       it "has a zero utc offset" do
         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
-        # if this is actually your time zone, the following tests are useless
+      context "when setting ActiveSupport time zone" do
         time_zone_override "Stockholm"
 
         let(:date) do
@@ -944,12 +635,10 @@ describe Mongoid::Extensions::Time do
       end
 
       it "returns a time" do
-        expect(Time.mongoize(array)).to eq(Time.local(*array))
+        expect(Time.mongoize(array)).to eq(Time.zone.local(*array))
       end
 
-      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
+      context "when setting ActiveSupport time zone" do
         time_zone_override "Stockholm"
 
         it "assumes the given time is local" do
@@ -964,11 +653,11 @@ describe Mongoid::Extensions::Time do
   describe "#mongoize" do
 
     let!(:time) do
-      Time.local(2010, 11, 19)
+      Time.zone.local(2010, 11, 19)
     end
 
     let!(:eom_time) do
-      Time.local(2012, 11, 30, 23, 59, 59, 999999.999)
+      Time.zone.local(2012, 11, 30, 23, 59, 59, 999999.999)
     end
 
     let!(:eom_time_mongoized) do
@@ -1008,15 +697,8 @@ describe Mongoid::Extensions::Time 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 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'
+    context "when setting ActiveSupport time zone" do
+      include_context 'setting ActiveSupport time zone'
 
       it_behaves_like 'mongoizes to Time'
       it_behaves_like 'maintains precision when mongoized'