2 files changed, 31 insertions, 10 deletions
diff --git a/activesupport/test/core_ext/module/reachable_test.rb b/activesupport/test/core_ext/module/reachable_test.rb
index a69fc6839e..097a72fa5b 100644
--- a/activesupport/test/core_ext/module/reachable_test.rb
+++ b/activesupport/test/core_ext/module/reachable_test.rb
@@ -5,13 +5,17 @@ require "active_support/core_ext/module/reachable"
 
 class AnonymousTest < ActiveSupport::TestCase
   test "an anonymous class or module is not reachable" do
-    assert !Module.new.reachable?
-    assert !Class.new.reachable?
+    assert_deprecated do
+      assert !Module.new.reachable?
+      assert !Class.new.reachable?
+    end
   end
 
   test "ordinary named classes or modules are reachable" do
-    assert Kernel.reachable?
-    assert Object.reachable?
+    assert_deprecated do
+      assert Kernel.reachable?
+      assert Object.reachable?
+    end
   end
 
   test "a named class or module whose constant has gone is not reachable" do
@@ -21,8 +25,10 @@ class AnonymousTest < ActiveSupport::TestCase
     self.class.send(:remove_const, :C)
     self.class.send(:remove_const, :M)
 
-    assert !c.reachable?
-    assert !m.reachable?
+    assert_deprecated do
+      assert !c.reachable?
+      assert !m.reachable?
+    end
   end
 
   test "a named class or module whose constants store different objects are not reachable" do
@@ -35,9 +41,11 @@ class AnonymousTest < ActiveSupport::TestCase
     eval "class C; end"
     eval "module M; end"
 
-    assert C.reachable?
-    assert M.reachable?
-    assert !c.reachable?
-    assert !m.reachable?
+    assert_deprecated do
+      assert C.reachable?
+      assert M.reachable?
+      assert !c.reachable?
+      assert !m.reachable?
+    end
   end
 end
diff --git a/activesupport/test/ordered_options_test.rb b/activesupport/test/ordered_options_test.rb
index 7f2e774c02..2c67bb02ac 100644
--- a/activesupport/test/ordered_options_test.rb
+++ b/activesupport/test/ordered_options_test.rb
@@ -102,4 +102,17 @@ class OrderedOptionsTest < ActiveSupport::TestCase
     end
     assert_raises(KeyError) { a.non_existing_key! }
   end
+
+  def test_inheritable_options_with_bang
+    a = ActiveSupport::InheritableOptions.new(foo: :bar)
+
+    assert_nothing_raised { a.foo! }
+    assert_equal a.foo, a.foo!
+
+    assert_raises(KeyError) do
+      a.foo = nil
+      a.foo!
+    end
+    assert_raises(KeyError) { a.non_existing_key! }
+  end
 end