1 files changed, 51 insertions, 14 deletions
diff --git a/spec/ruby/core/thread/shared/exit.rb b/spec/ruby/core/thread/shared/exit.rb
index 3c63517d92..a294c3a4d6 100644
--- a/spec/ruby/core/thread/shared/exit.rb
+++ b/spec/ruby/core/thread/shared/exit.rb
@@ -56,8 +56,8 @@ describe :thread_exit, shared: true do
     Thread.pass while @inner.status and @inner.status != "sleep"
     @outer.send(@method)
     @outer.join
-    ScratchPad.recorded.should include(:inner_ensure_clause)
-    ScratchPad.recorded.should include(:outer_ensure_clause)
+    ScratchPad.recorded.should.include?(:inner_ensure_clause)
+    ScratchPad.recorded.should.include?(:outer_ensure_clause)
   end
 
   it "does not set $!" do
@@ -66,6 +66,26 @@ describe :thread_exit, shared: true do
     ScratchPad.recorded.should == nil
   end
 
+  it "does not reset $!" do
+    ScratchPad.record []
+
+    exc = RuntimeError.new("foo")
+    thread = Thread.new do
+      begin
+        raise exc
+      ensure
+        ScratchPad << $!
+        begin
+          Thread.current.send(@method)
+        ensure
+          ScratchPad << $!
+        end
+      end
+    end
+    thread.join
+    ScratchPad.recorded.should == [exc, exc]
+  end
+
   it "cannot be rescued" do
     thread = Thread.new do
       begin
@@ -73,26 +93,43 @@ describe :thread_exit, shared: true do
       rescue Exception
         ScratchPad.record :in_rescue
       end
-     ScratchPad.record :end_of_thread_block
+      ScratchPad.record :end_of_thread_block
     end
 
     thread.join
     ScratchPad.recorded.should == nil
   end
 
-  with_feature :fiber do
-    it "kills the entire thread when a fiber is active" do
-      t = Thread.new do
-        Fiber.new do
-          sleep
-        end.resume
+  it "kills the entire thread when a fiber is active" do
+    t = Thread.new do
+      Fiber.new do
+        sleep
+      end.resume
+      ScratchPad.record :fiber_resumed
+    end
+    Thread.pass while t.status and t.status != "sleep"
+    t.send(@method)
+    t.join
+    ScratchPad.recorded.should == nil
+  end
+
+  it "kills other fibers of that thread without running their ensure clauses" do
+    t = Thread.new do
+      f = Fiber.new do
         ScratchPad.record :fiber_resumed
+        begin
+          Fiber.yield
+        ensure
+          ScratchPad.record :fiber_ensure
+        end
       end
-      Thread.pass while t.status and t.status != "sleep"
-      t.send(@method)
-      t.join
-      ScratchPad.recorded.should == nil
+      f.resume
+      sleep
     end
+    Thread.pass until t.stop?
+    t.send(@method)
+    t.join
+    ScratchPad.recorded.should == :fiber_resumed
   end
 
   # This spec is a mess. It fails randomly, it hangs on MRI, it needs to be removed
@@ -118,7 +155,7 @@ describe :thread_exit, shared: true do
 
     it "propagates inner exception to Thread.join if there is an outer ensure clause" do
       thread = ThreadSpecs.dying_thread_with_outer_ensure(@method) { }
-      lambda { thread.join }.should raise_error(RuntimeError, "In dying thread")
+      -> { thread.join }.should.raise(RuntimeError, "In dying thread")
     end
 
     it "runs all outer ensure clauses even if inner ensure clause raises exception" do