Merge 8ea7aea into 02a812d

lib/capsule_crm/serializer.rb

@@ -84,7 +84,7 @@ def attributes
         attrs.each do |key, value|
           attrs[key] = value.to_s(:db) if value.is_a?(Date)
           if value.is_a?(DateTime)
-            attrs[key] = value.strftime("%Y-%m-%dT%H:%M:%SZ")
+            attrs[key] = value.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
           end
         end
         additional_methods.each do |method|

spec/lib/capsule_crm/history_spec.rb

@@ -301,7 +301,7 @@
 
     it 'has the correct history item entry date' do
       expect(subject['historyItem']['entryDate']).
-        to eql(history.entry_date.strftime("%Y-%m-%dT%H:%M:%SZ"))
+        to eql(history.entry_date.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
     end
 
     it 'has the correct history item creator' do

spec/lib/capsule_crm/serializer_spec.rb

@@ -8,6 +8,7 @@ class SerializableTest
   attribute :name
   attribute :description
   attribute :something, Date
+  attribute :a_timestamp, DateTime
 end
 
 class SerializableInverse
@@ -130,5 +131,16 @@ class SerializableInverse
           to eql(Date.today.to_s(:db))
       end
     end
+
+    context 'when there are datetimes' do
+      let(:time) { Time.now }
+
+      before { object.a_timestamp = time }
+
+      it 'uses the UTC time' do
+        expect(subject['serializabletest']['aTimestamp'])
+          .to eql(time.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
+      end
+    end
   end
 end