aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_object.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a3d0bb8da..74fbb6181e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 21 20:46:02 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * test/ruby/test_object.rb: renamed tests to explicitly class name.
+ [fix GH-877] Patch by @yui-knk
+
Tue Apr 21 05:31:00 2015 Eric Wong <e@80x24.org>
* ext/socket/lib/socket.rb (connect_internal): avoid common exceptions
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index d5b4a1b612..29ca2e58f1 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -238,7 +238,7 @@ class TestObject < Test::Unit::TestCase
assert_equal(false, o.instance_variable_defined?(:@foo))
end
- def test_convert_type
+ def test_convert_string
o = Object.new
def o.to_s; 1; end
assert_raise(TypeError) { String(o) }
@@ -248,7 +248,7 @@ class TestObject < Test::Unit::TestCase
assert_raise(TypeError) { String(o) }
end
- def test_check_convert_type
+ def test_convert_array
o = Object.new
def o.to_a; 1; end
assert_raise(TypeError) { Array(o) }