1 files changed, 10 insertions, 13 deletions
diff --git a/spec/ruby/library/shellwords/shellwords_spec.rb b/spec/ruby/library/shellwords/shellwords_spec.rb
index f8ab0cbd9d..d1b61e0a6e 100644
--- a/spec/ruby/library/shellwords/shellwords_spec.rb
+++ b/spec/ruby/library/shellwords/shellwords_spec.rb
@@ -1,36 +1,33 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 require 'shellwords'
-include Shellwords
 
 describe "Shellwords#shellwords" do
   it "honors quoted strings" do
-    shellwords('a "b b" a').should == ['a', 'b b', 'a']
+    Shellwords.shellwords('a "b b" a').should == ['a', 'b b', 'a']
   end
 
   it "honors escaped double quotes" do
-    shellwords('a "\"b\" c" d').should == ['a', '"b" c', 'd']
+    Shellwords.shellwords('a "\"b\" c" d').should == ['a', '"b" c', 'd']
   end
 
   it "honors escaped single quotes" do
-    shellwords("a \"'b' c\" d").should == ['a', "'b' c", 'd']
+    Shellwords.shellwords("a \"'b' c\" d").should == ['a', "'b' c", 'd']
   end
 
   it "honors escaped spaces" do
-    shellwords('a b\ c d').should == ['a', 'b c', 'd']
+    Shellwords.shellwords('a b\ c d').should == ['a', 'b c', 'd']
   end
 
   it "raises ArgumentError when double quoted strings are misquoted" do
-    lambda { shellwords('a "b c d e') }.should raise_error(ArgumentError)
+    -> { Shellwords.shellwords('a "b c d e') }.should.raise(ArgumentError)
   end
 
   it "raises ArgumentError when single quoted strings are misquoted" do
-    lambda { shellwords("a 'b c d e") }.should raise_error(ArgumentError)
+    -> { Shellwords.shellwords("a 'b c d e") }.should.raise(ArgumentError)
   end
 
-  ruby_version_is '2.4' do
-    # https://bugs.ruby-lang.org/issues/10055
-    it "matches POSIX sh behavior for backslashes within double quoted strings" do
-      shellsplit('printf "%s\n"').should == ['printf', '%s\n']
-    end
+  # https://bugs.ruby-lang.org/issues/10055
+  it "matches POSIX sh behavior for backslashes within double quoted strings" do
+    Shellwords.shellsplit('printf "%s\n"').should == ['printf', '%s\n']
   end
 end