1 files changed, 29 insertions, 26 deletions
diff --git a/spec/ruby/core/io/initialize_spec.rb b/spec/ruby/core/io/initialize_spec.rb
index 5bf194f15c..3425e5ac37 100644
--- a/spec/ruby/core/io/initialize_spec.rb
+++ b/spec/ruby/core/io/initialize_spec.rb
@@ -4,7 +4,7 @@ require_relative 'fixtures/classes'
 describe "IO#initialize" do
   before :each do
     @name = tmp("io_initialize.txt")
-    @io = new_io @name
+    @io = IO.new(new_fd(@name))
     @fd = @io.fileno
   end
 
@@ -13,45 +13,48 @@ describe "IO#initialize" do
     rm_r @name
   end
 
-  # File descriptor numbers are not predictable in multi-threaded code;
-  # MJIT will be opening/closing files the background
-  without_feature :mjit do
-    it "reassociates the IO instance with the new descriptor when passed a Fixnum" do
-      fd = new_fd @name, "r:utf-8"
-      @io.send :initialize, fd, 'r'
-      @io.fileno.should == fd
-      # initialize has closed the old descriptor
-      lambda { IO.for_fd(@fd).close }.should raise_error(Errno::EBADF)
-    end
-
-    it "calls #to_int to coerce the object passed as an fd" do
-      obj = mock('fileno')
-      fd = new_fd @name, "r:utf-8"
-      obj.should_receive(:to_int).and_return(fd)
-      @io.send :initialize, obj, 'r'
-      @io.fileno.should == fd
-      # initialize has closed the old descriptor
-      lambda { IO.for_fd(@fd).close }.should raise_error(Errno::EBADF)
-    end
+  it "reassociates the IO instance with the new descriptor when passed an Integer" do
+    fd = new_fd @name, "r:utf-8"
+    @io.send :initialize, fd, 'r'
+    @io.fileno.should == fd
+  end
+
+  it "calls #to_int to coerce the object passed as an fd" do
+    obj = mock('fileno')
+    fd = new_fd @name, "r:utf-8"
+    obj.should_receive(:to_int).and_return(fd)
+    @io.send :initialize, obj, 'r'
+    @io.fileno.should == fd
+  end
+
+  it "accepts options as keyword arguments" do
+    fd = new_fd @name, "w:utf-8"
+
+    @io.send(:initialize, fd, "w", flags: File::CREAT)
+    @io.fileno.should == fd
+
+    -> {
+      @io.send(:initialize, fd, "w", {flags: File::CREAT})
+    }.should.raise(ArgumentError, "wrong number of arguments (given 3, expected 1..2)")
   end
 
   it "raises a TypeError when passed an IO" do
-    lambda { @io.send :initialize, STDOUT, 'w' }.should raise_error(TypeError)
+    -> { @io.send :initialize, STDOUT, 'w' }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed nil" do
-    lambda { @io.send :initialize, nil, 'w' }.should raise_error(TypeError)
+    -> { @io.send :initialize, nil, 'w' }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a String" do
-    lambda { @io.send :initialize, "4", 'w' }.should raise_error(TypeError)
+    -> { @io.send :initialize, "4", 'w' }.should.raise(TypeError)
   end
 
   it "raises IOError on closed stream" do
-    lambda { @io.send :initialize, IOSpecs.closed_io.fileno }.should raise_error(IOError)
+    -> { @io.send :initialize, IOSpecs.closed_io.fileno }.should.raise(IOError)
   end
 
   it "raises an Errno::EBADF when given an invalid file descriptor" do
-    lambda { @io.send :initialize, -1, 'w' }.should raise_error(Errno::EBADF)
+    -> { @io.send :initialize, -1, 'w' }.should.raise(Errno::EBADF)
   end
 end