diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-06-18 23:44:24 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-06-18 23:44:24 +0900 |
| commit | a47cc0c211dac780936ec2d08a9742ad4b146cb9 (patch) | |
| tree | 9c613a385ddf2a265c4ed02462846074439fe2eb /test | |
| parent | 61b495c15961c3be4158c6ff33e0ec07480d6c7a (diff) | |
| parent | 2f952a8f95ef44bc23864b6dae09c4c7f23407a2 (diff) | |
| download | mruby-a47cc0c211dac780936ec2d08a9742ad4b146cb9.tar.gz mruby-a47cc0c211dac780936ec2d08a9742ad4b146cb9.zip | |
resolve conflict
Diffstat (limited to 'test')
| -rw-r--r-- | test/t/enumerable.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/t/enumerable.rb b/test/t/enumerable.rb index 5c9b14f00..21acd209e 100644 --- a/test/t/enumerable.rb +++ b/test/t/enumerable.rb @@ -109,13 +109,15 @@ end assert('Enumerable#partition', '15.3.2.2.16') do [0,1,2,3,4,5,6,7,8,9].partition do |i| i % 2 == 0 - end == [[0,2,4,6,8], [1,3,5,7,9]] + end + assert_equal [[0,2,4,6,8], [1,3,5,7,9]], partition end assert('Enumerable#reject', '15.3.2.2.17') do - [0,1,2,3,4,5,6,7,8,9].reject do |i| + reject = [0,1,2,3,4,5,6,7,8,9].reject do |i| i % 2 == 0 - end == [1,3,5,7,9] + end + assert_equal [1,3,5,7,9], reject end assert('Enumerable#select', '15.3.2.2.18') do |