aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-20 18:31:13 +0100
committerJosé Valim <jose.valim@gmail.com>2011-12-20 18:38:20 +0100
commitfb1c06a694b343aa0d5753cb1174ddda3ecfb817 (patch)
tree8ae1d8f889e50d1e2d27c9182e65d271ab149f4d /activesupport/test
parent6bb4ad3868b0605ec43dbab5a489563c5909e828 (diff)
downloadrails-fb1c06a694b343aa0d5753cb1174ddda3ecfb817.tar.gz
rails-fb1c06a694b343aa0d5753cb1174ddda3ecfb817.tar.bz2
rails-fb1c06a694b343aa0d5753cb1174ddda3ecfb817.zip
Remove more dead code from AS.
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/multibyte_chars_test.rb6
-rw-r--r--activesupport/test/multibyte_utils_test.rb20
2 files changed, 7 insertions, 19 deletions
diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb
index ba04638354..20e56e2c81 100644
--- a/activesupport/test/multibyte_chars_test.rb
+++ b/activesupport/test/multibyte_chars_test.rb
@@ -143,10 +143,8 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
assert_not_equal original, proxy.to_s
end
- if RUBY_VERSION >= '1.9'
- def test_unicode_string_should_have_utf8_encoding
- assert_equal Encoding::UTF_8, UNICODE_STRING.encoding
- end
+ def test_unicode_string_should_have_utf8_encoding
+ assert_equal Encoding::UTF_8, UNICODE_STRING.encoding
end
def test_identity
diff --git a/activesupport/test/multibyte_utils_test.rb b/activesupport/test/multibyte_utils_test.rb
index 9a8f7050fe..f807492be0 100644
--- a/activesupport/test/multibyte_utils_test.rb
+++ b/activesupport/test/multibyte_utils_test.rb
@@ -73,22 +73,12 @@ class MultibyteUtilsTest < ActiveSupport::TestCase
'invalid Shift-JIS' => [184, 158, 8, 0, 255, 136, 165].pack('C*')
}
- if Kernel.const_defined?(:Encoding)
- def example(key)
- STRINGS[key].force_encoding(Encoding.default_external)
- end
-
- def examples
- STRINGS.values.map { |s| s.force_encoding(Encoding.default_external) }
- end
- else
- def example(key)
- STRINGS[key]
- end
+ def example(key)
+ STRINGS[key].force_encoding(Encoding.default_external)
+ end
- def examples
- STRINGS.values
- end
+ def examples
+ STRINGS.values.map { |s| s.force_encoding(Encoding.default_external) }
end
KCODE_TO_ENCODING = Hash.new(Encoding::BINARY).