From facd02511b30aa27fd1a33d39b9c28109738652e Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 25 Mar 2016 09:29:32 +0000 Subject: merge revision(s) 53949: [Backport #9810] * numeric.c (num_step_scan_args): comparison String with Numeric should raise TypeError. it is an invalid type, but not a mismatch the number of arguments. [ruby-core:62430] [Bug #9810] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_float.rb | 2 +- test/ruby/test_numeric.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index a959f60a69..ca171b5c27 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -558,7 +558,7 @@ class TestFloat < Test::Unit::TestCase end def test_num2dbl - assert_raise(ArgumentError) do + assert_raise(TypeError) do 1.0.step(2.0, "0.5") {} end assert_raise(TypeError) do diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index 98fabc4e13..79e152955e 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -247,8 +247,8 @@ class TestNumeric < Test::Unit::TestCase assert_raise(ArgumentError) { 1.step(10, 1, 0).size } assert_raise(ArgumentError) { 1.step(10, 0) { } } assert_raise(ArgumentError) { 1.step(10, 0).size } - assert_raise(ArgumentError) { 1.step(10, "1") { } } - assert_raise(ArgumentError) { 1.step(10, "1").size } + assert_raise(TypeError) { 1.step(10, "1") { } } + assert_raise(TypeError) { 1.step(10, "1").size } assert_raise(TypeError) { 1.step(10, nil) { } } assert_raise(TypeError) { 1.step(10, nil).size } assert_nothing_raised { 1.step(by: 0, to: nil) } -- cgit v1.2.3