Merge remote-tracking branch 'remotes/johnnyshields/evolve-date-to-ti…

…me-local' into evolve-rework

lib/mongoid/criteria/queryable/extensions/date.rb

@@ -25,7 +25,7 @@ def __evolve_date__
           #
           # @return [ Time ] The date as a local time.
           def __evolve_time__
-            ::Time.local(year, month, day)
+            ::Time.configured.local(year, month, day).to_time
           end
 
           module ClassMethods

spec/mongoid/criteria/queryable/extensions/date_spec.rb

@@ -25,20 +25,54 @@
 
   describe "#__evolve_time__" do
 
-    let(:date) do
-      Date.new(2010, 1, 1)
-    end
+    context "when using ActiveSupport's time zone" do
+      include_context 'using AS time zone'
 
-    let(:evolved) do
-      date.__evolve_time__
-    end
+      let(:date) do
+        Date.new(2010, 1, 1)
+      end
 
-    let(:expected) do
-      Time.local(2010, 1, 1, 0, 0, 0)
+      let(:expected_time) do
+        Time.zone.local(2010, 1, 1, 0, 0, 0, 0)
+      end
+
+      let(:evolved) do
+        date.__evolve_time__
+      end
+
+      it 'is an AS::TimeWithZone' do
+        expect(evolved.class).to eq(Time)
+      end
+
+      it 'is equal to expected time' do
+        expect(expected_time).to be_a(ActiveSupport::TimeWithZone)
+        expect(evolved).to eq(expected_time)
+      end
     end
 
-    it "returns the time" do
-      expect(evolved).to eq(expected)
+    context "when not using ActiveSupport's time zone" do
+      include_context 'not using AS time zone'
+
+      let(:date) do
+        Date.new(2010, 1, 1)
+      end
+
+      let(:expected_time) do
+        Time.local(2010, 1, 1, 0, 0, 0, 0)
+      end
+
+      let(:evolved) do
+        date.__evolve_time__
+      end
+
+      it 'is a Time' do
+        expect(evolved.class).to eq(Time)
+      end
+
+      it 'is equal to expected time' do
+        expect(expected_time).to be_a(Time)
+        expect(evolved).to eq(expected_time)
+      end
     end
   end