From 041b9b8a1c1661f90e8e586fddce981bfdb17f11 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 14 Sep 2007 00:34:43 +0000 Subject: Some 1.9 forward compatibility git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7474 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/test/core_ext/enumerable_test.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'activesupport/test/core_ext/enumerable_test.rb') diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb index 0590846b7b..55fdcf32ce 100644 --- a/activesupport/test/core_ext/enumerable_test.rb +++ b/activesupport/test/core_ext/enumerable_test.rb @@ -8,8 +8,7 @@ end class EnumerableTests < Test::Unit::TestCase def test_group_by names = %w(marcel sam david jeremy) - klass = Class.new - klass.send(:attr_accessor, :name) + klass = Struct.new(:name) objects = (1..50).inject([]) do |people,| p = klass.new p.name = names.sort_by { rand }.first @@ -38,10 +37,13 @@ class EnumerableTests < Test::Unit::TestCase end def test_nil_sums - assert_raise(TypeError) { [5, 15, nil].sum } + expected_raise = RUBY_VERSION < '1.9.0' ? TypeError : NoMethodError + + assert_raise(expected_raise) { [5, 15, nil].sum } payments = [ Payment.new(5), Payment.new(15), Payment.new(10), Payment.new(nil) ] - assert_raise(TypeError) { payments.sum(&:price) } + assert_raise(expected_raise) { payments.sum(&:price) } + assert_equal 60, payments.sum { |p| p.price.to_i * 2 } end -- cgit v1.2.3