Merge branch '1765-enumerator'

sparklemotion · Jun 16, 2018 · 06ac6ba · 06ac6ba
2 parents 96a4574 + 00bafb7
commit 06ac6ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/nokogiri/xml/node_set.rb b/lib/nokogiri/xml/node_set.rb
@@ -198,6 +198,8 @@ def remove_attr name
       ###
       # Iterate over each node, yielding  to +block+
       def each(&block)
+        return to_enum unless block_given?
+
         0.upto(length - 1) do |x|
           yield self[x]
         end

diff --git a/test/xml/test_node_set.rb b/test/xml/test_node_set.rb
@@ -672,6 +672,14 @@ def test_include_on_empty_node_set
         assert ! empty_set.include?(employee)
       end
 
+      def test_each
+        employees = @xml.search("//employee")
+        enum = employees.each
+        assert_instance_of Enumerator, enum
+        assert_equal enum.next, employees[0]
+        assert_equal enum.next, employees[1]
+      end
+
       def test_children
         employees = @xml.search("//employee")
         count = 0