aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-11 04:58:27 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-11 04:58:27 +0000
commit3cf7a0a46037f32b95b5ffb358cb898233d5c5db (patch)
tree7a780b46eedb55daa761296005b163fdeea5f3e4 /activesupport/test
parent4b53e26ef612d870a01e646c45bcc4198ad3bd1a (diff)
downloadrails-3cf7a0a46037f32b95b5ffb358cb898233d5c5db.tar.gz
rails-3cf7a0a46037f32b95b5ffb358cb898233d5c5db.tar.bz2
rails-3cf7a0a46037f32b95b5ffb358cb898233d5c5db.zip
Added Kernel#silence_warnings and puts it into use throughout the framework
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2179 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/core_ext/kernel_test.rb (renamed from activesupport/test/misc_test.rb)4
-rw-r--r--activesupport/test/core_ext/string_ext_test.rb3
-rw-r--r--activesupport/test/dependencies_test.rb1
3 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/test/misc_test.rb b/activesupport/test/core_ext/kernel_test.rb
index cfd54c0ad0..d757362243 100644
--- a/activesupport/test/misc_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -1,7 +1,7 @@
require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/active_support/misc'
+require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/kernel'
-class MiscTest < Test::Unit::TestCase
+class KernelTest < Test::Unit::TestCase
def test_silence_warnings
silence_warnings { assert_nil $VERBOSE }
assert_equal 1234, silence_warnings { 1234 }
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index c1c1918817..15189a75b1 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -1,6 +1,7 @@
require 'test/unit'
+require 'date'
require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/string'
-require File.dirname(__FILE__) + '/../../lib/active_support/misc'
+require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/kernel'
silence_warnings do
require File.dirname(__FILE__) + '/../inflector_test'
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 1af960ee36..a34fc0d323 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -1,6 +1,5 @@
require 'test/unit'
$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib/active_support/'
-require 'misc'
require 'dependencies'
class DependenciesTest < Test::Unit::TestCase