Update to ruby/spec@6f38a82

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 76 insertions, 94 deletions

diff --git a/spec/ruby/core/file/mkfifo_spec.rb b/spec/ruby/core/file/mkfifo_spec.rb
index f8842418af..a6db87a12e 100644
--- a/spec/ruby/core/file/mkfifo_spec.rb
+++ b/spec/ruby/core/file/mkfifo_spec.rb
@@ -1,53 +1,51 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "2.3" do
-  describe "File.mkfifo" do
-    platform_is_not :windows do
-      before do
-        @path = tmp('fifo')
-      end
+describe "File.mkfifo" do
+  platform_is_not :windows do
+    before do
+      @path = tmp('fifo')
+    end
 
-      after do
-        rm_r(@path)
-      end
+    after do
+      rm_r(@path)
+    end
 
-      context "when path passed responds to :to_path" do
-        it "creates a FIFO file at the path specified" do
-          File.mkfifo(@path)
-          File.ftype(@path).should == "fifo"
-        end
+    context "when path passed responds to :to_path" do
+      it "creates a FIFO file at the path specified" do
+        File.mkfifo(@path)
+        File.ftype(@path).should == "fifo"
       end
+    end
 
-      context "when path passed is not a String value" do
-        it "raises a TypeError" do
-          lambda { File.mkfifo(:"/tmp/fifo") }.should raise_error(TypeError)
-        end
+    context "when path passed is not a String value" do
+      it "raises a TypeError" do
+        lambda { File.mkfifo(:"/tmp/fifo") }.should raise_error(TypeError)
       end
+    end
 
-      context "when path does not exist" do
-        it "raises an Errno::ENOENT exception" do
-          lambda { File.mkfifo("/bogus/path") }.should raise_error(Errno::ENOENT)
-        end
+    context "when path does not exist" do
+      it "raises an Errno::ENOENT exception" do
+        lambda { File.mkfifo("/bogus/path") }.should raise_error(Errno::ENOENT)
       end
+    end
 
-      it "creates a FIFO file at the passed path" do
-        File.mkfifo(@path.to_s)
-        File.ftype(@path).should == "fifo"
-      end
+    it "creates a FIFO file at the passed path" do
+      File.mkfifo(@path.to_s)
+      File.ftype(@path).should == "fifo"
+    end
 
-      it "creates a FIFO file with passed mode & ~umask" do
-        File.mkfifo(@path, 0755)
-        File.stat(@path).mode.should == 010755 & ~File.umask
-      end
+    it "creates a FIFO file with passed mode & ~umask" do
+      File.mkfifo(@path, 0755)
+      File.stat(@path).mode.should == 010755 & ~File.umask
+    end
 
-      it "creates a FIFO file with a default mode of 0666 & ~umask" do
-        File.mkfifo(@path)
-        File.stat(@path).mode.should == 010666 & ~File.umask
-      end
+    it "creates a FIFO file with a default mode of 0666 & ~umask" do
+      File.mkfifo(@path)
+      File.stat(@path).mode.should == 010666 & ~File.umask
+    end
 
-      it "returns 0 after creating the FIFO file" do
-        File.mkfifo(@path).should == 0
-      end
+    it "returns 0 after creating the FIFO file" do
+      File.mkfifo(@path).should == 0
     end
   end
 end
diff --git a/spec/ruby/core/file/open_spec.rb b/spec/ruby/core/file/open_spec.rb
index b5add5dff4..6ccac75a9a 100644
--- a/spec/ruby/core/file/open_spec.rb
+++ b/spec/ruby/core/file/open_spec.rb
@@ -524,28 +524,26 @@ describe "File.open" do
     File.size(@file).should == 0
   end
 
-  ruby_version_is "2.3" do
-    platform_is :linux do
-      guard -> { defined?(File::TMPFILE) } do
-        it "creates an unnamed temporary file with File::TMPFILE" do
-          dir = tmp("tmpfilespec")
-          mkdir_p dir
-          begin
+  platform_is :linux do
+    guard -> { defined?(File::TMPFILE) } do
+      it "creates an unnamed temporary file with File::TMPFILE" do
+        dir = tmp("tmpfilespec")
+        mkdir_p dir
+        begin
+          Dir["#{dir}/*"].should == []
+          File.open(dir, "r+", flags: File::TMPFILE) do |io|
+            io.write("ruby")
+            io.flush
+            io.rewind
+            io.read.should == "ruby"
             Dir["#{dir}/*"].should == []
-            File.open(dir, "r+", flags: File::TMPFILE) do |io|
-              io.write("ruby")
-              io.flush
-              io.rewind
-              io.read.should == "ruby"
-              Dir["#{dir}/*"].should == []
-            end
-          rescue Errno::EOPNOTSUPP, Errno::EINVAL
-            # EOPNOTSUPP: no support from the filesystem
-            # EINVAL: presumably bug in glibc
-            1.should == 1
-          ensure
-            rm_r dir
           end
+        rescue Errno::EOPNOTSUPP, Errno::EINVAL
+          # EOPNOTSUPP: no support from the filesystem
+          # EINVAL: presumably bug in glibc
+          1.should == 1
+        ensure
+          rm_r dir
         end
       end
     end
@@ -586,22 +584,20 @@ describe "File.open" do
     @fh = File.open(@file, options)
   end
 
-  ruby_version_is "2.3" do
-    it "accepts extra flags as a keyword argument and combine with a string mode" do
-      lambda {
-        File.open(@file, "w", flags: File::EXCL) { }
-      }.should raise_error(Errno::EEXIST)
+  it "accepts extra flags as a keyword argument and combine with a string mode" do
+    lambda {
+      File.open(@file, "w", flags: File::EXCL) { }
+    }.should raise_error(Errno::EEXIST)
 
-      lambda {
-        File.open(@file, mode: "w", flags: File::EXCL) { }
-      }.should raise_error(Errno::EEXIST)
-    end
+    lambda {
+      File.open(@file, mode: "w", flags: File::EXCL) { }
+    }.should raise_error(Errno::EEXIST)
+  end
 
-    it "accepts extra flags as a keyword argument and combine with an integer mode" do
-      lambda {
-        File.open(@file, File::WRONLY | File::CREAT, flags: File::EXCL) { }
-      }.should raise_error(Errno::EEXIST)
-    end
+  it "accepts extra flags as a keyword argument and combine with an integer mode" do
+    lambda {
+      File.open(@file, File::WRONLY | File::CREAT, flags: File::EXCL) { }
+    }.should raise_error(Errno::EEXIST)
   end
 
   platform_is_not :windows do
diff --git a/spec/ruby/core/file/shared/unlink.rb b/spec/ruby/core/file/shared/unlink.rb
index 7b0413b76b..42b6a77c5d 100644
--- a/spec/ruby/core/file/shared/unlink.rb
+++ b/spec/ruby/core/file/shared/unlink.rb
@@ -48,16 +48,14 @@ describe :file_unlink, shared: true do
     File.send(@method, mock_to_path(@file1)).should == 1
   end
 
-  ruby_version_is "2.3" do
-    platform_is :windows do
-      it "allows deleting an open file with File::SHARE_DELETE" do
-        path = tmp("share_delete.txt")
-        File.open(path, mode: File::CREAT | File::WRONLY | File::BINARY | File::SHARE_DELETE) do |f|
-          File.exist?(path).should be_true
-          File.send(@method, path)
-        end
-        File.exist?(path).should be_false
+  platform_is :windows do
+    it "allows deleting an open file with File::SHARE_DELETE" do
+      path = tmp("share_delete.txt")
+      File.open(path, mode: File::CREAT | File::WRONLY | File::BINARY | File::SHARE_DELETE) do |f|
+        File.exist?(path).should be_true
+        File.send(@method, path)
       end
+      File.exist?(path).should be_false
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/ino_spec.rb b/spec/ruby/core/file/stat/ino_spec.rb
index 3ae2a7d439..42370aecb7 100644
--- a/spec/ruby/core/file/stat/ino_spec.rb
+++ b/spec/ruby/core/file/stat/ino_spec.rb
@@ -19,20 +19,10 @@ describe "File::Stat#ino" do
   end
 
   platform_is :windows do
-    ruby_version_is ""..."2.3" do
-      it "returns 0" do
-        st = File.stat(@file)
-        st.ino.should be_kind_of(Integer)
-        st.ino.should == 0
-      end
-    end
-
-    ruby_version_is "2.3" do
-      it "returns BY_HANDLE_FILE_INFORMATION.nFileIndexHigh/Low of a File::Stat object" do
-        st = File.stat(@file)
-        st.ino.should be_kind_of(Integer)
-        st.ino.should > 0
-      end
+    it "returns BY_HANDLE_FILE_INFORMATION.nFileIndexHigh/Low of a File::Stat object" do
+      st = File.stat(@file)
+      st.ino.should be_kind_of(Integer)
+      st.ino.should > 0
     end
   end
 end