aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/multibyte_chars_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-08 21:55:43 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-08 22:02:57 -0800
commit20cdaddfd27dfeef5c853e85fafa4e13b6da05f3 (patch)
tree6a102d87cb71ac8fbc7dafeee2ed7e185d68b90d /activesupport/test/multibyte_chars_test.rb
parent7ad461b44dabb586fbad190493ac4ecd96104597 (diff)
downloadrails-20cdaddfd27dfeef5c853e85fafa4e13b6da05f3.tar.gz
rails-20cdaddfd27dfeef5c853e85fafa4e13b6da05f3.tar.bz2
rails-20cdaddfd27dfeef5c853e85fafa4e13b6da05f3.zip
Ruby 1.9.2: work around changes to flatten and nil.to_str
Diffstat (limited to 'activesupport/test/multibyte_chars_test.rb')
-rw-r--r--activesupport/test/multibyte_chars_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb
index 4ff74abf61..9245263270 100644
--- a/activesupport/test/multibyte_chars_test.rb
+++ b/activesupport/test/multibyte_chars_test.rb
@@ -228,8 +228,8 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
assert !@chars.include?('a')
end
- def test_include_raises_type_error_when_nil_is_passed
- assert_raise(TypeError) do
+ def test_include_raises_when_nil_is_passed
+ assert_raise(RUBY_VERSION >= '1.9.2' ? NoMethodError : TypeError) do
@chars.include?(nil)
end
end
@@ -659,4 +659,4 @@ class MultibyteInternalsTest < ActiveSupport::TestCase
"Expected byte offset #{byte_offset} to translate to #{character_offset}"
end
end
-end \ No newline at end of file
+end