aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-08-19 13:17:23 -0700
committerZachary Scott <e@zzak.io>2014-08-19 13:17:23 -0700
commita5d50ac1477bda03df42f147a64f6dbdf1b79e95 (patch)
tree26bebd4c79724784687a6378ef7dfd628b8f0453
parent6986535a2153bd9d1906f72abd1379809ff18141 (diff)
downloadrails-a5d50ac1477bda03df42f147a64f6dbdf1b79e95.tar.gz
rails-a5d50ac1477bda03df42f147a64f6dbdf1b79e95.tar.bz2
rails-a5d50ac1477bda03df42f147a64f6dbdf1b79e95.zip
Move date and time requires to time_travel_test, also include
'abstract_unit'. cc #16564
-rw-r--r--activesupport/test/test_test.rb2
-rw-r--r--activesupport/test/time_travel_test.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index 2c284f3b71..c93192f207 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -1,6 +1,4 @@
require 'abstract_unit'
-require 'active_support/core_ext/date'
-require 'active_support/core_ext/numeric/time'
class AssertDifferenceTest < ActiveSupport::TestCase
def setup
diff --git a/activesupport/test/time_travel_test.rb b/activesupport/test/time_travel_test.rb
index cb5aac7a33..065539671d 100644
--- a/activesupport/test/time_travel_test.rb
+++ b/activesupport/test/time_travel_test.rb
@@ -1,3 +1,7 @@
+require 'abstract_unit'
+require 'active_support/core_ext/date'
+require 'active_support/core_ext/numeric/time'
+
class TimeTravelTest < ActiveSupport::TestCase
setup do
Time.stubs now: Time.now