1 files changed, 15 insertions, 4 deletions
diff --git a/spec/ruby/core/enumerator/next_spec.rb b/spec/ruby/core/enumerator/next_spec.rb
index 3e9ed8b015..77e79185a9 100644
--- a/spec/ruby/core/enumerator/next_spec.rb
+++ b/spec/ruby/core/enumerator/next_spec.rb
@@ -13,15 +13,26 @@ describe "Enumerator#next" do
 
   it "raises a StopIteration exception at the end of the stream" do
     3.times { @enum.next }
-    -> { @enum.next }.should raise_error(StopIteration)
+    -> { @enum.next }.should.raise(StopIteration)
   end
 
   it "cannot be called again until the enumerator is rewound" do
     3.times { @enum.next }
-    -> { @enum.next }.should raise_error(StopIteration)
-    -> { @enum.next }.should raise_error(StopIteration)
-    -> { @enum.next }.should raise_error(StopIteration)
+    -> { @enum.next }.should.raise(StopIteration)
+    -> { @enum.next }.should.raise(StopIteration)
+    -> { @enum.next }.should.raise(StopIteration)
     @enum.rewind
     @enum.next.should == 1
   end
+
+  it "restarts the enumerator if an exception terminated a previous iteration" do
+    exception = StandardError.new
+    enum = Enumerator.new do
+      raise exception
+    end
+
+    result = 2.times.map { enum.next rescue $! }
+
+    result.should == [exception, exception]
+  end
 end