Update to ruby/spec@e829fb0

3 files changed, 11 insertions, 118 deletions

diff --git a/spec/ruby/core/string/end_with_spec.rb b/spec/ruby/core/string/end_with_spec.rb
index 9ced0ca3d2..ac4fff72ad 100644
--- a/spec/ruby/core/string/end_with_spec.rb
+++ b/spec/ruby/core/string/end_with_spec.rb
@@ -1,56 +1,8 @@
 # -*- encoding: utf-8 -*-
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative '../../shared/string/end_with'
 
 describe "String#end_with?" do
-  it "returns true only if ends match" do
-    s = "hello"
-    s.should.end_with?('o')
-    s.should.end_with?('llo')
-  end
-
-  it 'returns false if the end does not match' do
-    s = 'hello'
-    s.should_not.end_with?('ll')
-  end
-
-  it "returns true if the search string is empty" do
-    "hello".should.end_with?("")
-    "".should.end_with?("")
-  end
-
-  it "returns true only if any ending match" do
-    "hello".should.end_with?('x', 'y', 'llo', 'z')
-  end
-
-  it "converts its argument using :to_str" do
-    s = "hello"
-    find = mock('o')
-    find.should_receive(:to_str).and_return("o")
-    s.should.end_with?(find)
-  end
-
-  it "ignores arguments not convertible to string" do
-    "hello".should_not.end_with?()
-    -> { "hello".end_with?(1) }.should raise_error(TypeError)
-    -> { "hello".end_with?(["o"]) }.should raise_error(TypeError)
-    -> { "hello".end_with?(1, nil, "o") }.should raise_error(TypeError)
-  end
-
-  it "uses only the needed arguments" do
-    find = mock('h')
-    find.should_not_receive(:to_str)
-    "hello".should.end_with?("o",find)
-  end
-
-  it "works for multibyte strings" do
-    "céréale".should.end_with?("réale")
-  end
-
-  it "raises an Encoding::CompatibilityError if the encodings are incompatible" do
-    pat = "ア".encode Encoding::EUC_JP
-    -> do
-      "あれ".end_with?(pat)
-    end.should raise_error(Encoding::CompatibilityError)
-  end
+  it_behaves_like :end_with, :to_s
 end
diff --git a/spec/ruby/core/string/start_with_spec.rb b/spec/ruby/core/string/start_with_spec.rb
index 11c8041925..aaed197ff3 100644
--- a/spec/ruby/core/string/start_with_spec.rb
+++ b/spec/ruby/core/string/start_with_spec.rb
@@ -1,74 +1,8 @@
 # -*- encoding: utf-8 -*-
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative '../../shared/string/start_with'
 
 describe "String#start_with?" do
-  it "returns true only if beginning match" do
-    s = "hello"
-    s.should.start_with?('h')
-    s.should.start_with?('hel')
-    s.should_not.start_with?('el')
-  end
-
-  it "returns true only if any beginning match" do
-    "hello".should.start_with?('x', 'y', 'he', 'z')
-  end
-
-  it "returns true if the search string is empty" do
-    "hello".should.start_with?("")
-    "".should.start_with?("")
-  end
-
-  it "converts its argument using :to_str" do
-    s = "hello"
-    find = mock('h')
-    find.should_receive(:to_str).and_return("h")
-    s.should.start_with?(find)
-  end
-
-  it "ignores arguments not convertible to string" do
-    "hello".should_not.start_with?()
-    -> { "hello".start_with?(1) }.should raise_error(TypeError)
-    -> { "hello".start_with?(["h"]) }.should raise_error(TypeError)
-    -> { "hello".start_with?(1, nil, "h") }.should raise_error(TypeError)
-  end
-
-  it "uses only the needed arguments" do
-    find = mock('h')
-    find.should_not_receive(:to_str)
-    "hello".should.start_with?("h",find)
-  end
-
-  it "works for multibyte strings" do
-    "céréale".should.start_with?("cér")
-  end
-
-  it "supports regexps" do
-    regexp = /[h1]/
-    "hello".should.start_with?(regexp)
-    "1337".should.start_with?(regexp)
-    "foxes are 1337".should_not.start_with?(regexp)
-    "chunky\n12bacon".should_not.start_with?(/12/)
-  end
-
-  it "supports regexps with ^ and $ modifiers" do
-    regexp1 = /^\d{2}/
-    regexp2 = /\d{2}$/
-    "12test".should.start_with?(regexp1)
-    "test12".should_not.start_with?(regexp1)
-    "12test".should_not.start_with?(regexp2)
-    "test12".should_not.start_with?(regexp2)
-  end
-
-  it "sets Regexp.last_match if it returns true" do
-    regexp = /test-(\d+)/
-    "test-1337".start_with?(regexp).should be_true
-    Regexp.last_match.should_not be_nil
-    Regexp.last_match[1].should == "1337"
-    $1.should == "1337"
-
-    "test-asdf".start_with?(regexp).should be_false
-    Regexp.last_match.should be_nil
-    $1.should be_nil
-  end
+  it_behaves_like :start_with, :to_s
 end
diff --git a/spec/ruby/core/string/uminus_spec.rb b/spec/ruby/core/string/uminus_spec.rb
index 91f91fdb1e..3a81b64126 100644
--- a/spec/ruby/core/string/uminus_spec.rb
+++ b/spec/ruby/core/string/uminus_spec.rb
@@ -69,4 +69,11 @@ describe 'String#-@' do
       (-dynamic).should equal(-"this string is frozen".freeze)
     end
   end
+
+  ruby_version_is "3.0" do
+    it "interns the provided string if it is frozen" do
+      dynamic = "this string is unique and frozen #{rand}".freeze
+      (-dynamic).should equal(dynamic)
+    end
+  end
 end