aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/core_ext/string_ext_test.rb6
-rw-r--r--activesupport/test/inflector_test.rb2
2 files changed, 2 insertions, 6 deletions
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 15189a75b1..0e82badad7 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -1,11 +1,7 @@
require 'test/unit'
require 'date'
require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/string'
-require File.dirname(__FILE__) + '/../../lib/active_support/core_ext/kernel'
-
-silence_warnings do
- require File.dirname(__FILE__) + '/../inflector_test'
-end
+require File.dirname(__FILE__) + '/../inflector_test' unless defined? InflectorTest
class StringInflectionsTest < Test::Unit::TestCase
def test_pluralize
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index d92b4a76a8..d0d7b0bedd 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -1,5 +1,5 @@
require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/active_support/inflector'
+require File.dirname(__FILE__) + '/../lib/active_support/inflector' unless defined? Inflector
module Ace
module Base