5 files changed, 24 insertions, 14 deletions
diff --git a/spec/ruby/core/string/allocate_spec.rb b/spec/ruby/core/string/allocate_spec.rb
index 5b36b4fd05..30d5f60594 100644
--- a/spec/ruby/core/string/allocate_spec.rb
+++ b/spec/ruby/core/string/allocate_spec.rb
@@ -14,6 +14,6 @@ describe "String.allocate" do
   end
 
   it "returns a binary String" do
-    String.new.encoding.should == Encoding::BINARY
+    String.allocate.encoding.should == Encoding::BINARY
   end
 end
diff --git a/spec/ruby/core/string/bytesize_spec.rb b/spec/ruby/core/string/bytesize_spec.rb
index b8b07cfbec..a31f3ae671 100644
--- a/spec/ruby/core/string/bytesize_spec.rb
+++ b/spec/ruby/core/string/bytesize_spec.rb
@@ -2,7 +2,7 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
-describe "#String#bytesize" do
+describe "String#bytesize" do
   it "returns the length of self in bytes" do
     "hello".bytesize.should == 5
     " ".bytesize.should == 1
diff --git a/spec/ruby/core/string/element_set_spec.rb b/spec/ruby/core/string/element_set_spec.rb
index c9e02a7381..0aabbacd0e 100644
--- a/spec/ruby/core/string/element_set_spec.rb
+++ b/spec/ruby/core/string/element_set_spec.rb
@@ -141,6 +141,12 @@ describe "String#[]= with Integer index" do
     str.encoding.should equal(Encoding::BINARY)
   end
 
+  it "updates the string to a compatible encoding" do
+    str = "  "
+    str[1] = [0xB9].pack("C*")
+    str.encoding.should == Encoding::ASCII_8BIT
+  end
+
   it "raises an Encoding::CompatibilityError if the replacement encoding is incompatible" do
     str = "あれ"
     rep = "が".encode Encoding::EUC_JP
diff --git a/spec/ruby/core/string/shared/length.rb b/spec/ruby/core/string/shared/length.rb
index e931961455..94e5ec135b 100644
--- a/spec/ruby/core/string/shared/length.rb
+++ b/spec/ruby/core/string/shared/length.rb
@@ -12,9 +12,9 @@ describe :string_length, shared: true do
 
   it "returns the length of a string in different encodings" do
     utf8_str = 'こにちわ' * 100
-    utf8_str.size.should == 400
-    utf8_str.encode(Encoding::UTF_32BE).size.should == 400
-    utf8_str.encode(Encoding::SHIFT_JIS).size.should == 400
+    utf8_str.send(@method).should == 400
+    utf8_str.encode(Encoding::UTF_32BE).send(@method).should == 400
+    utf8_str.encode(Encoding::SHIFT_JIS).send(@method).should == 400
   end
 
   it "returns the length of the new self after encoding is changed" do
@@ -32,24 +32,24 @@ describe :string_length, shared: true do
     concat.encoding.should == Encoding::UTF_8
     concat.bytesize.should == 4
 
-    concat.size.should == 2
+    concat.send(@method).should == 2
     concat.force_encoding(Encoding::ASCII_8BIT)
-    concat.size.should == 4
+    concat.send(@method).should == 4
   end
 
   it "adds 1 for every invalid byte in UTF-8" do
-    "\xF4\x90\x80\x80".size.should == 4
-    "a\xF4\x90\x80\x80b".size.should == 6
-    "é\xF4\x90\x80\x80è".size.should == 6
+    "\xF4\x90\x80\x80".send(@method).should == 4
+    "a\xF4\x90\x80\x80b".send(@method).should == 6
+    "é\xF4\x90\x80\x80è".send(@method).should == 6
   end
 
   it "adds 1 (and not 2) for a incomplete surrogate in UTF-16" do
-    "\x00\xd8".force_encoding("UTF-16LE").size.should == 1
-    "\xd8\x00".force_encoding("UTF-16BE").size.should == 1
+    "\x00\xd8".force_encoding("UTF-16LE").send(@method).should == 1
+    "\xd8\x00".force_encoding("UTF-16BE").send(@method).should == 1
   end
 
   it "adds 1 for a broken sequence in UTF-32" do
-    "\x04\x03\x02\x01".force_encoding("UTF-32LE").size.should == 1
-    "\x01\x02\x03\x04".force_encoding("UTF-32BE").size.should == 1
+    "\x04\x03\x02\x01".force_encoding("UTF-32LE").send(@method).should == 1
+    "\x01\x02\x03\x04".force_encoding("UTF-32BE").send(@method).should == 1
   end
 end
diff --git a/spec/ruby/core/string/split_spec.rb b/spec/ruby/core/string/split_spec.rb
index a373be360d..94f6c9aaee 100644
--- a/spec/ruby/core/string/split_spec.rb
+++ b/spec/ruby/core/string/split_spec.rb
@@ -62,6 +62,10 @@ describe "String#split with String" do
     ",".split(",", -1).should == ["", ""]
   end
 
+  it "raises a RangeError when the limit is larger than int" do
+    -> { "a,b".split(" ", 2147483649) }.should raise_error(RangeError)
+  end
+
   it "defaults to $; when string isn't given or nil" do
     suppress_warning do
       old_fs = $;