1 files changed, 41 insertions, 16 deletions
diff --git a/spec/ruby/library/stringio/puts_spec.rb b/spec/ruby/library/stringio/puts_spec.rb
index 93a676aa15..ebe74d4a45 100644
--- a/spec/ruby/library/stringio/puts_spec.rb
+++ b/spec/ruby/library/stringio/puts_spec.rb
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "StringIO#puts when passed an Array" do
   before :each do
@@ -30,11 +30,12 @@ describe "StringIO#puts when passed an Array" do
 
   it "does not honor the global output record separator $\\" do
     begin
-      old_rs, $\ = $\, "test"
+      old_rs = $\
+      suppress_warning {$\ = "test"}
       @io.puts([1, 2, 3, 4])
       @io.string.should == "1\n2\n3\n4\n"
     ensure
-      $\ = old_rs
+      suppress_warning {$\ = old_rs}
     end
   end
 
@@ -51,6 +52,14 @@ describe "StringIO#puts when passed an Array" do
     @io.puts([obj])
     @io.string.should == "to_s\n"
   end
+
+  it "returns general object info if :to_s does not return a string" do
+    object = mock('hola')
+    object.should_receive(:to_s).and_return(false)
+
+    @io.puts(object).should == nil
+    @io.string.should == object.inspect.split(" ")[0] + ">\n"
+  end
 end
 
 describe "StringIO#puts when passed 1 or more objects" do
@@ -60,11 +69,12 @@ describe "StringIO#puts when passed 1 or more objects" do
 
   it "does not honor the global output record separator $\\" do
     begin
-      old_rs, $\ = $\, "test"
+      old_rs = $\
+      suppress_warning {$\ = "test"}
       @io.puts(1, 2, 3, 4)
       @io.string.should == "1\n2\n3\n4\n"
     ensure
-      $\ = old_rs
+      suppress_warning {$\ = old_rs}
     end
   end
 
@@ -91,6 +101,20 @@ describe "StringIO#puts when passed 1 or more objects" do
     @io.puts ''
     @io.string.should == "\n"
   end
+
+  it "handles concurrent writes correctly" do
+    n = 8
+    go = false
+    threads = n.times.map { |i|
+      Thread.new {
+        Thread.pass until go
+        @io.puts i
+      }
+    }
+    go = true
+    threads.each(&:join)
+    @io.string.size.should == n.times.map { |i| "#{i}\n" }.join.size
+  end
 end
 
 describe "StringIO#puts when passed no arguments" do
@@ -99,7 +123,7 @@ describe "StringIO#puts when passed no arguments" do
   end
 
   it "returns nil" do
-    @io.puts.should be_nil
+    @io.puts.should == nil
   end
 
   it "prints a newline" do
@@ -109,18 +133,19 @@ describe "StringIO#puts when passed no arguments" do
 
   it "does not honor the global output record separator $\\" do
     begin
-      old_rs, $\ = $\, "test"
+      old_rs = $\
+      suppress_warning {$\ = "test"}
       @io.puts
       @io.string.should == "\n"
     ensure
-      $\ = old_rs
+      suppress_warning {$\ = old_rs}
     end
   end
 end
 
 describe "StringIO#puts when in append mode" do
   before :each do
-    @io = StringIO.new("example", "a")
+    @io = StringIO.new(+"example", "a")
   end
 
   it "appends the passed argument to the end of self" do
@@ -133,24 +158,24 @@ describe "StringIO#puts when in append mode" do
 
   it "correctly updates self's position" do
     @io.puts(", testing")
-    @io.pos.should eql(17)
+    @io.pos.should.eql?(17)
   end
 end
 
 describe "StringIO#puts when self is not writable" do
   it "raises an IOError" do
-    io = StringIO.new("test", "r")
-    lambda { io.puts }.should raise_error(IOError)
+    io = StringIO.new(+"test", "r")
+    -> { io.puts }.should.raise(IOError)
 
-    io = StringIO.new("test")
+    io = StringIO.new(+"test")
     io.close_write
-    lambda { io.puts }.should raise_error(IOError)
+    -> { io.puts }.should.raise(IOError)
   end
 end
 
 describe "StringIO#puts when passed an encoded string" do
   it "stores the bytes unmodified" do
-    io = StringIO.new("")
+    io = StringIO.new(+"")
     io.puts "\x00\x01\x02"
     io.puts "æåø"