Update to ruby/spec@6f38a82

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

3 files changed, 14 insertions, 29 deletions

diff --git a/spec/ruby/core/argf/close_spec.rb b/spec/ruby/core/argf/close_spec.rb
index 0fc9a1894a..56faf30664 100644
--- a/spec/ruby/core/argf/close_spec.rb
+++ b/spec/ruby/core/argf/close_spec.rb
@@ -20,21 +20,10 @@ describe "ARGF.close" do
     end
   end
 
-  ruby_version_is ""..."2.3" do
-    it "raises an IOError if called on a closed stream" do
-      argf [@file1_name] do
-        lambda { @argf.close }.should_not raise_error
-        lambda { @argf.close }.should raise_error(IOError)
-      end
-    end
-  end
-
-  ruby_version_is "2.3" do
-    it "doesn't raise an IOError if called on a closed stream" do
-      argf [@file1_name] do
-        lambda { @argf.close }.should_not raise_error
-        lambda { @argf.close }.should_not raise_error
-      end
+  it "doesn't raise an IOError if called on a closed stream" do
+    argf [@file1_name] do
+      lambda { @argf.close }.should_not raise_error
+      lambda { @argf.close }.should_not raise_error
     end
   end
 end
diff --git a/spec/ruby/core/argf/read_nonblock_spec.rb b/spec/ruby/core/argf/read_nonblock_spec.rb
index 51201421a5..466264119f 100644
--- a/spec/ruby/core/argf/read_nonblock_spec.rb
+++ b/spec/ruby/core/argf/read_nonblock_spec.rb
@@ -70,11 +70,9 @@ platform_is_not :windows do
         end
       end
 
-      ruby_version_is "2.3" do
-        it 'returns :wait_readable when the :exception is set to false' do
-          argf ['-'] do
-            @argf.read_nonblock(4, nil, exception: false).should == :wait_readable
-          end
+      it 'returns :wait_readable when the :exception is set to false' do
+        argf ['-'] do
+          @argf.read_nonblock(4, nil, exception: false).should == :wait_readable
         end
       end
     end
diff --git a/spec/ruby/core/argf/readpartial_spec.rb b/spec/ruby/core/argf/readpartial_spec.rb
index 70b0312261..4e697683dc 100644
--- a/spec/ruby/core/argf/readpartial_spec.rb
+++ b/spec/ruby/core/argf/readpartial_spec.rb
@@ -54,15 +54,13 @@ describe "ARGF.readpartial" do
     end
   end
 
-  ruby_version_is "2.3" do
-    it "raises an EOFError if the exception was raised while reading the last file" do
-      argf [@file1_name, @file2_name] do
-        @argf.readpartial(@file1.size)
-        @argf.readpartial(1)
-        @argf.readpartial(@file2.size)
-        lambda { @argf.readpartial(1) }.should raise_error(EOFError)
-        lambda { @argf.readpartial(1) }.should raise_error(EOFError)
-      end
+  it "raises an EOFError if the exception was raised while reading the last file" do
+    argf [@file1_name, @file2_name] do
+      @argf.readpartial(@file1.size)
+      @argf.readpartial(1)
+      @argf.readpartial(@file2.size)
+      lambda { @argf.readpartial(1) }.should raise_error(EOFError)
+      lambda { @argf.readpartial(1) }.should raise_error(EOFError)
     end
   end