1 files changed, 30 insertions, 31 deletions

diff --git a/spec/ruby/core/string/clear_spec.rb b/spec/ruby/core/string/clear_spec.rb
index c1bab8f39e..d4688d3689 100644
--- a/spec/ruby/core/string/clear_spec.rb
+++ b/spec/ruby/core/string/clear_spec.rb
@@ -1,39 +1,38 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+# frozen_string_literal: false
+require_relative '../../spec_helper'
 
-with_feature :encoding do
-  describe "String#clear" do
-    before :each do
-      @s = "Jolene"
-    end
+describe "String#clear" do
+  before :each do
+    @s = "Jolene"
+  end
 
-    it "sets self equal to the empty String" do
-      @s.clear
-      @s.should == ""
-    end
+  it "sets self equal to the empty String" do
+    @s.clear
+    @s.should == ""
+  end
 
-    it "returns self after emptying it" do
-      cleared = @s.clear
-      cleared.should == ""
-      cleared.object_id.should == @s.object_id
-    end
+  it "returns self after emptying it" do
+    cleared = @s.clear
+    cleared.should == ""
+    cleared.should.equal? @s
+  end
 
-    it "preserves its encoding" do
-      @s.encode!(Encoding::SHIFT_JIS)
-      @s.encoding.should == Encoding::SHIFT_JIS
-      @s.clear.encoding.should == Encoding::SHIFT_JIS
-      @s.encoding.should == Encoding::SHIFT_JIS
-    end
+  it "preserves its encoding" do
+    @s.encode!(Encoding::SHIFT_JIS)
+    @s.encoding.should == Encoding::SHIFT_JIS
+    @s.clear.encoding.should == Encoding::SHIFT_JIS
+    @s.encoding.should == Encoding::SHIFT_JIS
+  end
 
-    it "works with multibyte Strings" do
-      s = "\u{9765}\u{876}"
-      s.clear
-      s.should == ""
-    end
+  it "works with multibyte Strings" do
+    s = "\u{9765}\u{876}"
+    s.clear
+    s.should == ""
+  end
 
-    it "raises a #{frozen_error_class} if self is frozen" do
-      @s.freeze
-      lambda { @s.clear        }.should raise_error(frozen_error_class)
-      lambda { "".freeze.clear }.should raise_error(frozen_error_class)
-    end
+  it "raises a FrozenError if self is frozen" do
+    @s.freeze
+    -> { @s.clear        }.should.raise(FrozenError)
+    -> { "".freeze.clear }.should.raise(FrozenError)
   end
 end