From 67078e81f57523fdf65ba7a9d919a146763363a5 Mon Sep 17 00:00:00 2001
From: eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 13 Jun 2018 21:41:45 +0000
Subject: Update to ruby/spec@4bc7a2b

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 spec/ruby/security/cve_2018_6914_spec.rb | 78 +++++++++++++++-----------------
 1 file changed, 36 insertions(+), 42 deletions(-)

(limited to 'spec/ruby/security/cve_2018_6914_spec.rb')

diff --git a/spec/ruby/security/cve_2018_6914_spec.rb b/spec/ruby/security/cve_2018_6914_spec.rb
index 657341e474..1837ca0cef 100644
--- a/spec/ruby/security/cve_2018_6914_spec.rb
+++ b/spec/ruby/security/cve_2018_6914_spec.rb
@@ -2,58 +2,52 @@ require_relative '../spec_helper'
 
 require 'tempfile'
 
-guard -> {
-  ruby_version_is "2.3.7"..."2.4" or
-  ruby_version_is "2.4.4"..."2.5" or
-  ruby_version_is "2.5.1"
-} do
-  describe "CVE-2018-6914 is resisted by" do
-    before :all do
-      @traversal_path = Array.new(Dir.pwd.split('/').count, '..').join('/') + Dir.pwd + '/'
-      @traversal_path.delete!(':') if /mswin|mingw/ =~ RUBY_PLATFORM
-    end
-
-    it "Tempfile.open by deleting separators" do
-      begin
-        expect = Dir.glob(@traversal_path + '*').count
-        t = Tempfile.open([@traversal_path, 'foo'])
-        actual = Dir.glob(@traversal_path + '*').count
-        actual.should == expect
-      ensure
-        t.close!
-      end
-    end
-
-    it "Tempfile.new by deleting separators" do
-      begin
-        expect = Dir.glob(@traversal_path + '*').count
-        t = Tempfile.new(@traversal_path + 'foo')
-        actual = Dir.glob(@traversal_path + '*').count
-        actual.should == expect
-      ensure
-        t.close!
-      end
-    end
+describe "CVE-2018-6914 is resisted by" do
+  before :all do
+    @traversal_path = Array.new(Dir.pwd.split('/').count, '..').join('/') + Dir.pwd + '/'
+    @traversal_path.delete!(':') if /mswin|mingw/ =~ RUBY_PLATFORM
+  end
 
-    it "Tempfile.create by deleting separators" do
+  it "Tempfile.open by deleting separators" do
+    begin
       expect = Dir.glob(@traversal_path + '*').count
-      Tempfile.create(@traversal_path + 'foo')
+      t = Tempfile.open([@traversal_path, 'foo'])
       actual = Dir.glob(@traversal_path + '*').count
       actual.should == expect
+    ensure
+      t.close!
     end
+  end
 
-    it "Dir.mktmpdir by deleting separators" do
+  it "Tempfile.new by deleting separators" do
+    begin
       expect = Dir.glob(@traversal_path + '*').count
-      Dir.mktmpdir(@traversal_path + 'foo')
+      t = Tempfile.new(@traversal_path + 'foo')
       actual = Dir.glob(@traversal_path + '*').count
       actual.should == expect
+    ensure
+      t.close!
     end
+  end
 
-    it "Dir.mktmpdir with an array by deleting separators" do
-      expect = Dir.glob(@traversal_path + '*').count
-      Dir.mktmpdir([@traversal_path, 'foo'])
-      actual = Dir.glob(@traversal_path + '*').count
-      actual.should == expect
-    end
+  it "Tempfile.create by deleting separators" do
+    expect = Dir.glob(@traversal_path + '*').count
+    Tempfile.create(@traversal_path + 'foo')
+    actual = Dir.glob(@traversal_path + '*').count
+    actual.should == expect
+  end
+
+  it "Dir.mktmpdir by deleting separators" do
+    expect = Dir.glob(@traversal_path + '*').count
+    Dir.mktmpdir(@traversal_path + 'foo')
+    actual = Dir.glob(@traversal_path + '*').count
+    actual.should == expect
+  end
+
+  it "Dir.mktmpdir with an array by deleting separators" do
+    expect = Dir.glob(@traversal_path + '*').count
+    Dir.mktmpdir([@traversal_path, 'foo'])
+    actual = Dir.glob(@traversal_path + '*').count
+    actual.should == expect
   end
 end
-- 
cgit v1.2.3