summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-enum-lazy/test
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2016-11-30 12:54:20 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2016-11-30 12:54:20 +0900
commit779c2629fe3aff49caae35e1b7e0d15d2648cd58 (patch)
tree6df73d32caae523cfc9fd9a79b55dc88a2d899f2 /mrbgems/mruby-enum-lazy/test
parent3cf66a82187f8a34eaaddb0697803916ab6b5f24 (diff)
parent0f90227907b15f879319600cfa523be5928c5da9 (diff)
downloadmruby-779c2629fe3aff49caae35e1b7e0d15d2648cd58.tar.gz
mruby-779c2629fe3aff49caae35e1b7e0d15d2648cd58.zip
resolve conflict; ref #3306
Diffstat (limited to 'mrbgems/mruby-enum-lazy/test')
-rw-r--r--mrbgems/mruby-enum-lazy/test/lazy.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/mrbgems/mruby-enum-lazy/test/lazy.rb b/mrbgems/mruby-enum-lazy/test/lazy.rb
index 5218f97d9..940d070e8 100644
--- a/mrbgems/mruby-enum-lazy/test/lazy.rb
+++ b/mrbgems/mruby-enum-lazy/test/lazy.rb
@@ -1,9 +1,9 @@
-assert("Enumerable::Lazy") do
+assert("Enumerator::Lazy") do
a = [1, 2]
- assert_equal Enumerable::Lazy, a.lazy.class
+ assert_equal Enumerator::Lazy, a.lazy.class
end
-assert("Enumerable::Lazy laziness") do
+assert("Enumerator::Lazy laziness") do
a = Object.new
def a.each
return to_enum :each unless block_given?
@@ -40,13 +40,13 @@ assert("Enumerable::Lazy laziness") do
assert_equal [10,20], a.b
end
-assert("Enumrable::Lazy#to_enum") do
+assert("Enumrator::Lazy#to_enum") do
lazy_enum = (0..Float::INFINITY).lazy.to_enum(:each_slice, 2)
- assert_kind_of Enumerable::Lazy, lazy_enum
+ assert_kind_of Enumerator::Lazy, lazy_enum
assert_equal [0*1, 2*3, 4*5, 6*7], lazy_enum.map { |a| a.first * a.last }.first(4)
end
-assert("Enumerable::Lazy#zip with cycle") do
+assert("Enumerator::Lazy#zip with cycle") do
e1 = [1, 2, 3].cycle
e2 = [:a, :b].cycle
assert_equal [[1,:a],[2,:b],[3,:a]], e1.lazy.zip(e2).first(3)