aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-07-10 18:03:01 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-07-10 18:03:01 -0300
commit71618558be3b6926f2f96d92abcea6c7d04612c6 (patch)
tree0cc8ec17f6a7cc12ce431958cbeb3ca38aca47eb
parentf3bae24c81e7198d9bbedaf79056d9961e59113c (diff)
parent2f26f61154292091fc988b4b5f70a0c21326ae19 (diff)
downloadrails-71618558be3b6926f2f96d92abcea6c7d04612c6.tar.gz
rails-71618558be3b6926f2f96d92abcea6c7d04612c6.tar.bz2
rails-71618558be3b6926f2f96d92abcea6c7d04612c6.zip
Merge pull request #20836 from sikachu/fix-time-zone-test
Require yaml for time_with_zone isolation test
-rw-r--r--activesupport/test/core_ext/time_with_zone_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 54ef81aee8..477a42114b 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -2,6 +2,7 @@ require 'abstract_unit'
require 'active_support/time'
require 'time_zone_test_helpers'
require 'active_support/core_ext/string/strip'
+require 'yaml'
class TimeWithZoneTest < ActiveSupport::TestCase
include TimeZoneTestHelpers