1 files changed, 23 insertions, 11 deletions
diff --git a/spec/ruby/core/io/print_spec.rb b/spec/ruby/core/io/print_spec.rb
index e852757385..065cb3b8cb 100644
--- a/spec/ruby/core/io/print_spec.rb
+++ b/spec/ruby/core/io/print_spec.rb
@@ -1,18 +1,29 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
-describe IO, "#print" do
+describe "IO#print" do
   before :each do
-    @old_separator = $\
-    $\ = '->'
+    @old_record_separator = $\
+    @old_field_separator = $,
+    suppress_warning {
+      $\ = '->'
+      $, = '^^'
+    }
     @name = tmp("io_print")
   end
 
   after :each do
-    $\ = @old_separator
+    suppress_warning {
+      $\ = @old_record_separator
+      $, = @old_field_separator
+    }
     rm_r @name
   end
 
+  it "returns nil" do
+    touch(@name) { |f| f.print.should == nil }
+  end
+
   it "writes $_.to_s followed by $\\ (if any) to the stream if no arguments given" do
     o = mock('o')
     o.should_receive(:to_s).and_return("mockmockmock")
@@ -38,17 +49,18 @@ describe IO, "#print" do
     IO.read(@name).should == "hello#{$\}"
   end
 
-  it "writes each obj.to_s to the stream and appends $\\ (if any) given multiple objects" do
+  it "writes each obj.to_s to the stream separated by $, (if any) and appends $\\ (if any) given multiple objects" do
     o, o2 = Object.new, Object.new
     def o.to_s(); 'o'; end
     def o2.to_s(); 'o2'; end
 
-    touch(@name) { |f| f.print(o, o2) }
-    IO.read(@name).should == "#{o.to_s}#{o2.to_s}#{$\}"
+    suppress_warning {
+      touch(@name) { |f| f.print(o, o2) }
+    }
+    IO.read(@name).should == "#{o.to_s}#{$,}#{o2.to_s}#{$\}"
   end
 
   it "raises IOError on closed stream" do
-    lambda { IOSpecs.closed_io.print("stuff") }.should raise_error(IOError)
+    -> { IOSpecs.closed_io.print("stuff") }.should.raise(IOError)
   end
 end
-