File tree Expand file tree Collapse file tree 4 files changed +20
-3
lines changed Expand file tree Collapse file tree 4 files changed +20
-3
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ module Created
23
23
# person.set_created_at
24
24
def set_created_at
25
25
if !timeless? && !created_at
26
- time = Time . now . utc
26
+ time = Time . configured . now
27
27
self . updated_at = time if is_a? ( Updated ) && !updated_at_changed?
28
28
self . created_at = time
29
29
end
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ module Updated
24
24
# person.set_updated_at
25
25
def set_updated_at
26
26
if able_to_set_updated_at?
27
- self . updated_at = Time . now . utc unless updated_at_changed?
27
+ self . updated_at = Time . configured . now unless updated_at_changed?
28
28
end
29
29
30
30
clear_timeless_option
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ module InstanceMethods
22
22
# @return [ true/false ] false if record is new_record otherwise true.
23
23
def touch ( field = nil )
24
24
return false if _root . new_record?
25
- current = Time . now
25
+ current = Time . configured . now
26
26
field = database_field_name ( field )
27
27
write_attribute ( :updated_at , current ) if respond_to? ( "updated_at=" )
28
28
write_attribute ( field , current ) if field
Original file line number Diff line number Diff line change 14
14
Dokument . fields
15
15
end
16
16
17
+ let ( :time_zone ) { "Pacific Time (US & Canada)" }
18
+
19
+ around do |ex |
20
+ z = Time . zone
21
+ Time . zone = time_zone
22
+ ex . run
23
+ Time . zone = z
24
+ end
25
+
17
26
before do
18
27
document . run_callbacks ( :create )
19
28
document . run_callbacks ( :save )
35
44
expect ( document . updated_at ) . to be_within ( 10 ) . of ( Time . now . utc )
36
45
end
37
46
47
+ it "sets the created_at to the correct time zone" do
48
+ expect ( document . created_at . time_zone . name ) . to eq ( time_zone )
49
+ end
50
+
51
+ it "sets the updated_at to the correct time zone" do
52
+ expect ( document . updated_at . time_zone . name ) . to eq ( time_zone )
53
+ end
54
+
38
55
it "ensures created_at equals updated_at on new records" do
39
56
expect ( document . updated_at ) . to eq ( document . created_at )
40
57
end
You can’t perform that action at this time.
0 commit comments