1 files changed, 22 insertions, 31 deletions
diff --git a/spec/ruby/core/string/prepend_spec.rb b/spec/ruby/core/string/prepend_spec.rb
index 17e97fd844..a8da4e62cb 100644
--- a/spec/ruby/core/string/prepend_spec.rb
+++ b/spec/ruby/core/string/prepend_spec.rb
@@ -1,10 +1,11 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes.rb', __FILE__)
+# frozen_string_literal: false
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
 
 describe "String#prepend" do
   it "prepends the given argument to self and returns self" do
     str = "world"
-    str.prepend("hello ").should equal(str)
+    str.prepend("hello ").should.equal?(str)
     str.should == "hello world"
   end
 
@@ -16,16 +17,16 @@ describe "String#prepend" do
   end
 
   it "raises a TypeError if the given argument can't be converted to a String" do
-    lambda { "hello ".prepend [] }.should raise_error(TypeError)
-    lambda { 'hello '.prepend mock('x') }.should raise_error(TypeError)
+    -> { "hello ".prepend [] }.should.raise(TypeError)
+    -> { 'hello '.prepend mock('x') }.should.raise(TypeError)
   end
 
-  it "raises a RuntimeError when self is frozen" do
+  it "raises a FrozenError when self is frozen" do
     a = "hello"
     a.freeze
 
-    lambda { a.prepend "" }.should raise_error(RuntimeError)
-    lambda { a.prepend "test" }.should raise_error(RuntimeError)
+    -> { a.prepend "" }.should.raise(FrozenError)
+    -> { a.prepend "test" }.should.raise(FrozenError)
   end
 
   it "works when given a subclass instance" do
@@ -34,31 +35,21 @@ describe "String#prepend" do
     a.should == "hello world"
   end
 
-  it "taints self if other is tainted" do
-    x = "x"
-    x.prepend("".taint).tainted?.should be_true
-
-    x = "x"
-    x.prepend("y".taint).tainted?.should be_true
+  it "takes multiple arguments" do
+    str = " world"
+    str.prepend "he", "", "llo"
+    str.should == "hello world"
   end
 
-  ruby_version_is "2.4" do
-    it "takes multiple arguments" do
-      str = " world"
-      str.prepend "he", "", "llo"
-      str.should == "hello world"
-    end
-
-    it "prepends the initial value when given arguments contain 2 self" do
-      str = "hello"
-      str.prepend str, str
-      str.should == "hellohellohello"
-    end
+  it "prepends the initial value when given arguments contain 2 self" do
+    str = "hello"
+    str.prepend str, str
+    str.should == "hellohellohello"
+  end
 
-    it "returns self when given no arguments" do
-      str = "hello"
-      str.prepend.should equal(str)
-      str.should == "hello"
-    end
+  it "returns self when given no arguments" do
+    str = "hello"
+    str.prepend.should.equal?(str)
+    str.should == "hello"
   end
 end