1 files changed, 26 insertions, 47 deletions
diff --git a/spec/ruby/core/string/uminus_spec.rb b/spec/ruby/core/string/uminus_spec.rb
index dace04846c..43abf71d50 100644
--- a/spec/ruby/core/string/uminus_spec.rb
+++ b/spec/ruby/core/string/uminus_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative '../../spec_helper'
 
 describe 'String#-@' do
@@ -5,70 +6,48 @@ describe 'String#-@' do
     input  = 'foo'.freeze
     output = -input
 
-    output.should equal(input)
-    output.frozen?.should == true
+    output.should.equal?(input)
+    output.should.frozen?
   end
 
   it 'returns a frozen copy if the String is not frozen' do
     input  = 'foo'
     output = -input
 
-    output.frozen?.should == true
-    output.should_not equal(input)
+    output.should.frozen?
+    output.should_not.equal?(input)
     output.should == 'foo'
   end
 
-  ruby_version_is "2.5" do
-    it "returns the same object for equal unfrozen strings" do
-      origin = "this is a string"
-      dynamic = %w(this is a string).join(' ')
+  it "returns the same object for equal unfrozen strings" do
+    origin = "this is a string"
+    dynamic = %w(this is a string).join(' ')
 
-      origin.should_not equal(dynamic)
-      (-origin).should equal(-dynamic)
-    end
-
-    it "returns the same object when it's called on the same String literal" do
-      (-"unfrozen string").should equal(-"unfrozen string")
-      (-"unfrozen string").should_not equal(-"another unfrozen string")
-    end
+    origin.should_not.equal?(dynamic)
+    (-origin).should.equal?(-dynamic)
   end
 
-  ruby_version_is "2.5"..."2.6" do
-    it "does not deduplicate already frozen strings" do
-      dynamic = %w(this string is frozen).join(' ').freeze
-
-      dynamic.should_not equal("this string is frozen".freeze)
+  it "returns the same object when it's called on the same String literal" do
+    (-"unfrozen string").should.equal?(-"unfrozen string")
+    (-"unfrozen string").should_not.equal?(-"another unfrozen string")
+  end
 
-      (-dynamic).should_not equal("this string is frozen".freeze)
-      (-dynamic).should_not equal(-"this string is frozen".freeze)
-      (-dynamic).should == "this string is frozen"
-    end
+  it "deduplicates frozen strings" do
+    dynamic = %w(this string is frozen).join(' ').freeze
 
-    it "does not deduplicate tainted strings" do
-      dynamic = %w(this string is frozen).join(' ')
-      dynamic.taint
-      (-dynamic).should_not equal("this string is frozen".freeze)
-      (-dynamic).should_not equal(-"this string is frozen".freeze)
-      (-dynamic).should == "this string is frozen"
-    end
+    dynamic.should_not.equal?("this string is frozen".freeze)
 
-    it "does not deduplicate strings with additional instance variables" do
-      dynamic = %w(this string is frozen).join(' ')
-      dynamic.instance_variable_set(:@foo, :bar)
-      (-dynamic).should_not equal("this string is frozen".freeze)
-      (-dynamic).should_not equal(-"this string is frozen".freeze)
-      (-dynamic).should == "this string is frozen"
-    end
+    (-dynamic).should.equal?("this string is frozen".freeze)
+    (-dynamic).should.equal?((-"this string is frozen").freeze)
   end
 
-  ruby_version_is "2.6" do
-    it "deduplicates frozen strings" do
-      dynamic = %w(this string is frozen).join(' ').freeze
-
-      dynamic.should_not equal("this string is frozen".freeze)
+  it "does not deduplicate a frozen string when it has instance variables" do
+    dynamic = %w(this string is frozen).join(' ')
+    dynamic.instance_variable_set(:@a, 1)
+    dynamic.freeze
 
-      (-dynamic).should equal("this string is frozen".freeze)
-      (-dynamic).should equal(-"this string is frozen".freeze)
-    end
+    (-dynamic).should_not.equal?("this string is frozen".freeze)
+    (-dynamic).should_not.equal?((-"this string is frozen").freeze)
+    (-dynamic).should.equal?(-dynamic)
   end
 end