@@ -304,12 +304,12 @@ def with_time_zone(default = nil)
304
304
end
305
305
306
306
def with_default_timezone ( default = nil )
307
- prev_tz = ActiveRecord :: Base . default_timezone
307
+ prev_tz = ActiveRecord . default_timezone
308
308
begin
309
- ActiveRecord :: Base . default_timezone = default
309
+ ActiveRecord . default_timezone = default
310
310
yield
311
311
ensure
312
- ActiveRecord :: Base . default_timezone = prev_tz
312
+ ActiveRecord . default_timezone = prev_tz
313
313
end
314
314
end
315
315
@@ -355,13 +355,13 @@ def with_java_tz(new_tz)
355
355
def with_timezone_config ( cfg )
356
356
verify_default_timezone_config
357
357
358
- old_default_zone = ActiveRecord :: Base . default_timezone
358
+ old_default_zone = ActiveRecord . default_timezone
359
359
old_awareness = ActiveRecord ::Base . time_zone_aware_attributes
360
360
old_zone = Time . zone
361
361
362
362
begin
363
363
if cfg . has_key? ( :default )
364
- ActiveRecord :: Base . default_timezone = cfg [ :default ]
364
+ ActiveRecord . default_timezone = cfg [ :default ]
365
365
end
366
366
if cfg . has_key? ( :aware_attributes )
367
367
ActiveRecord ::Base . time_zone_aware_attributes = cfg [ :aware_attributes ]
@@ -372,7 +372,7 @@ def with_timezone_config(cfg)
372
372
373
373
yield
374
374
ensure
375
- ActiveRecord :: Base . default_timezone = old_default_zone
375
+ ActiveRecord . default_timezone = old_default_zone
376
376
ActiveRecord ::Base . time_zone_aware_attributes = old_awareness
377
377
Time . zone = old_zone
378
378
end
@@ -391,12 +391,12 @@ def verify_default_timezone_config(expected_time_zone: verify_expected_time_zone
391
391
Got: #{ Time . zone . inspect }
392
392
MSG
393
393
end
394
- if ActiveRecord :: Base . default_timezone != expected_default_timezone
394
+ if ActiveRecord . default_timezone != expected_default_timezone
395
395
$stderr. puts <<-MSG
396
396
\n #{ self }
397
- Global state `ActiveRecord::Base .default_timezone` was leaked.
397
+ Global state `ActiveRecord.default_timezone` was leaked.
398
398
Expected: #{ expected_default_timezone . inspect }
399
- Got: #{ ActiveRecord :: Base . default_timezone . inspect }
399
+ Got: #{ ActiveRecord . default_timezone . inspect }
400
400
MSG
401
401
end
402
402
if ActiveRecord ::Base . time_zone_aware_attributes != EXPECTED_TIME_ZONE_AWARE_ATTRIBUTES
0 commit comments