Skip to content

Commit 104e90e

Browse files
committed
default_timezone moved. Remove warning
1 parent 8d4f2b4 commit 104e90e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

test/test_helper.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,12 @@ def with_time_zone(default = nil)
304304
end
305305

306306
def with_default_timezone(default = nil)
307-
prev_tz = ActiveRecord::Base.default_timezone
307+
prev_tz = ActiveRecord.default_timezone
308308
begin
309-
ActiveRecord::Base.default_timezone = default
309+
ActiveRecord.default_timezone = default
310310
yield
311311
ensure
312-
ActiveRecord::Base.default_timezone = prev_tz
312+
ActiveRecord.default_timezone = prev_tz
313313
end
314314
end
315315

@@ -355,13 +355,13 @@ def with_java_tz(new_tz)
355355
def with_timezone_config(cfg)
356356
verify_default_timezone_config
357357

358-
old_default_zone = ActiveRecord::Base.default_timezone
358+
old_default_zone = ActiveRecord.default_timezone
359359
old_awareness = ActiveRecord::Base.time_zone_aware_attributes
360360
old_zone = Time.zone
361361

362362
begin
363363
if cfg.has_key?(:default)
364-
ActiveRecord::Base.default_timezone = cfg[:default]
364+
ActiveRecord.default_timezone = cfg[:default]
365365
end
366366
if cfg.has_key?(:aware_attributes)
367367
ActiveRecord::Base.time_zone_aware_attributes = cfg[:aware_attributes]
@@ -372,7 +372,7 @@ def with_timezone_config(cfg)
372372

373373
yield
374374
ensure
375-
ActiveRecord::Base.default_timezone = old_default_zone
375+
ActiveRecord.default_timezone = old_default_zone
376376
ActiveRecord::Base.time_zone_aware_attributes = old_awareness
377377
Time.zone = old_zone
378378
end
@@ -391,12 +391,12 @@ def verify_default_timezone_config(expected_time_zone: verify_expected_time_zone
391391
Got: #{Time.zone.inspect}
392392
MSG
393393
end
394-
if ActiveRecord::Base.default_timezone != expected_default_timezone
394+
if ActiveRecord.default_timezone != expected_default_timezone
395395
$stderr.puts <<-MSG
396396
\n#{self}
397-
Global state `ActiveRecord::Base.default_timezone` was leaked.
397+
Global state `ActiveRecord.default_timezone` was leaked.
398398
Expected: #{expected_default_timezone.inspect}
399-
Got: #{ActiveRecord::Base.default_timezone.inspect}
399+
Got: #{ActiveRecord.default_timezone.inspect}
400400
MSG
401401
end
402402
if ActiveRecord::Base.time_zone_aware_attributes != EXPECTED_TIME_ZONE_AWARE_ATTRIBUTES

0 commit comments

Comments
 (0)