4 files changed, 22 insertions, 17 deletions
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index 69a380c7cb..d824a16e98 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -635,7 +635,7 @@ class HashExtTest < ActiveSupport::TestCase
     assert_equal 1, h['first']
   end
 
-  def test_indifferent_subhashes
+  def test_indifferent_sub_hashes
     h = {'user' => {'id' => 5}}.with_indifferent_access
     ['user', :user].each {|user| [:id, 'id'].each {|id| assert_equal 5, h[user][id], "h[#{user.inspect}][#{id.inspect}] should be 5"}}
 
diff --git a/activesupport/test/core_ext/object/duplicable_test.rb b/activesupport/test/core_ext/object/duplicable_test.rb
index e0566e012c..84512380cf 100644
--- a/activesupport/test/core_ext/object/duplicable_test.rb
+++ b/activesupport/test/core_ext/object/duplicable_test.rb
@@ -5,34 +5,27 @@ require 'active_support/core_ext/numeric/time'
 
 class DuplicableTest < ActiveSupport::TestCase
   RAISE_DUP  = [nil, false, true, :symbol, 1, 2.3, 5.seconds]
-  YES = ['1', Object.new, /foo/, [], {}, Time.now, Class.new, Module.new]
-  NO = []
+  ALLOW_DUP = ['1', Object.new, /foo/, [], {}, Time.now, Class.new, Module.new]
 
+  # Needed to support Ruby 1.9.x, as it doesn't allow dup on BigDecimal, instead
+  # raises TypeError exception. Checking here on the runtime whether BigDecimal
+  # will allow dup or not.
   begin
     bd = BigDecimal.new('4.56')
-    YES << bd.dup
+    ALLOW_DUP << bd.dup
   rescue TypeError
     RAISE_DUP << bd
   end
 
-
   def test_duplicable
-    (RAISE_DUP + NO).each do |v|
+    RAISE_DUP.each do |v|
       assert !v.duplicable?
+      assert_raises(TypeError, v.class.name) { v.dup }
     end
 
-    YES.each do |v|
-      assert v.duplicable?, "#{v.class} should be duplicable"
-    end
-
-    (YES + NO).each do |v|
+    ALLOW_DUP.each do |v|
+      assert v.duplicable?, "#{ v.class } should be duplicable"
       assert_nothing_raised { v.dup }
     end
-
-    RAISE_DUP.each do |v|
-      assert_raises(TypeError, v.class.name) do
-        v.dup
-      end
-    end
   end
 end
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index ea12f1ced5..f8d4d0f0dc 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -296,6 +296,12 @@ class StringAccessTest < ActiveSupport::TestCase
     assert_equal 'x', 'x'.first(4)
   end
 
+  test "#first with Fixnum >= string length still returns a new string" do
+    string = "hello"
+    different_string = string.first(5)
+    assert_not_same different_string, string
+  end
+
   test "#last returns the last character" do
     assert_equal "o", "hello".last
     assert_equal 'x', 'x'.last
@@ -308,6 +314,12 @@ class StringAccessTest < ActiveSupport::TestCase
     assert_equal 'x', 'x'.last(4)
   end
 
+  test "#last with Fixnum >= string length still returns a new string" do
+    string = "hello"
+    different_string = string.last(5)
+    assert_not_same different_string, string
+  end
+
   test "access returns a real string" do
     hash = {}
     hash["h"] = true
diff --git a/activesupport/test/multibyte_conformance.rb b/activesupport/test/multibyte_conformance_test.rb
index 2baf724da4..2baf724da4 100644
--- a/activesupport/test/multibyte_conformance.rb
+++ b/activesupport/test/multibyte_conformance_test.rb