3 files changed, 16 insertions, 25 deletions
diff --git a/activesupport/test/core_ext/enumerable_test.rb b/activesupport/test/core_ext/enumerable_test.rb
index 8d71320931..b63464a36a 100644
--- a/activesupport/test/core_ext/enumerable_test.rb
+++ b/activesupport/test/core_ext/enumerable_test.rb
@@ -179,6 +179,21 @@ class EnumerableTests < ActiveSupport::TestCase
                  payments.index_by.each(&:price))
   end
 
+  def test_index_with
+    payments = GenericEnumerable.new([ Payment.new(5), Payment.new(15), Payment.new(10) ])
+
+    assert_equal({ Payment.new(5) => 5, Payment.new(15) => 15, Payment.new(10) => 10 }, payments.index_with(&:price))
+
+    assert_equal({ title: nil, body: nil }, %i( title body ).index_with(nil))
+    assert_equal({ title: [], body: [] }, %i( title body ).index_with([]))
+    assert_equal({ title: {}, body: {} }, %i( title body ).index_with({}))
+
+    assert_equal Enumerator, payments.index_with.class
+    assert_nil payments.index_with.size
+    assert_equal 42, (1..42).index_with.size
+    assert_equal({ Payment.new(5) => 5, Payment.new(15) => 15, Payment.new(10) => 10 }, payments.index_with.each(&:price))
+  end
+
   def test_many
     assert_equal false, GenericEnumerable.new([]).many?
     assert_equal false, GenericEnumerable.new([ 1 ]).many?
diff --git a/activesupport/test/core_ext/object/duplicable_test.rb b/activesupport/test/core_ext/object/duplicable_test.rb
index 635dd7f281..5203434ae6 100644
--- a/activesupport/test/core_ext/object/duplicable_test.rb
+++ b/activesupport/test/core_ext/object/duplicable_test.rb
@@ -19,7 +19,7 @@ class DuplicableTest < ActiveSupport::TestCase
                   "* https://github.com/rubinius/rubinius/issues/3089"
 
     RAISE_DUP.each do |v|
-      assert !v.duplicable?, "#{ v.inspect } should not be duplicable"
+      assert_not v.duplicable?, "#{ v.inspect } should not be duplicable"
       assert_raises(TypeError, v.class.name) { v.dup }
     end
 
diff --git a/activesupport/test/core_ext/regexp_ext_test.rb b/activesupport/test/core_ext/regexp_ext_test.rb
index 5737bdafda..7d18297b64 100644
--- a/activesupport/test/core_ext/regexp_ext_test.rb
+++ b/activesupport/test/core_ext/regexp_ext_test.rb
@@ -9,28 +9,4 @@ class RegexpExtAccessTests < ActiveSupport::TestCase
     assert_equal false, //.multiline?
     assert_equal false, /(?m:)/.multiline?
   end
-
-  # Based on https://github.com/ruby/ruby/blob/trunk/test/ruby/test_regexp.rb.
-  def test_match_p
-    /back(...)/ =~ "backref"
-    # must match here, but not in a separate method, e.g., assert_send,
-    # to check if $~ is affected or not.
-    assert_equal false, //.match?(nil)
-    assert_equal true, //.match?("")
-    assert_equal true, /.../.match?(:abc)
-    assert_raise(TypeError) { /.../.match?(Object.new) }
-    assert_equal true, /b/.match?("abc")
-    assert_equal true, /b/.match?("abc", 1)
-    assert_equal true, /../.match?("abc", 1)
-    assert_equal true, /../.match?("abc", -2)
-    assert_equal false, /../.match?("abc", -4)
-    assert_equal false, /../.match?("abc", 4)
-    assert_equal true, /\z/.match?("")
-    assert_equal true, /\z/.match?("abc")
-    assert_equal true, /R.../.match?("Ruby")
-    assert_equal false, /R.../.match?("Ruby", 1)
-    assert_equal false, /P.../.match?("Ruby")
-    assert_equal "backref", $&
-    assert_equal "ref", $1
-  end
 end