1 files changed, 33 insertions, 0 deletions
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 74ceff44f9..fb52613a23 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -490,6 +490,34 @@ module CacheStoreBehavior
     assert_equal({key => "bar"}, @cache.read_multi(key))
     assert @cache.delete(key)
   end
+
+  def test_cache_hit_instrumentation
+    key = "test_key"
+    subscribe_executed = false
+    ActiveSupport::Notifications.subscribe "cache_read.active_support" do |name, start, finish, id, payload|
+      subscribe_executed = true
+      assert_equal :fetch, payload[:super_operation]
+      assert payload[:hit]
+    end
+    assert @cache.write(key, "1", :raw => true)
+    assert @cache.fetch(key) {}
+    assert subscribe_executed
+  ensure
+    ActiveSupport::Notifications.unsubscribe "cache_read.active_support"
+  end
+
+  def test_cache_miss_instrumentation
+    subscribe_executed = false
+    ActiveSupport::Notifications.subscribe "cache_read.active_support" do |name, start, finish, id, payload|
+      subscribe_executed = true
+      assert_equal :fetch, payload[:super_operation]
+      assert_not payload[:hit]
+    end
+    assert_not @cache.fetch("bad_key") {}
+    assert subscribe_executed
+  ensure
+    ActiveSupport::Notifications.unsubscribe "cache_read.active_support"
+  end
 end
 
 # https://rails.lighthouseapp.com/projects/8994/tickets/6225-memcachestore-cant-deal-with-umlauts-and-special-characters
@@ -734,6 +762,11 @@ class FileStoreTest < ActiveSupport::TestCase
     assert_equal 1, @cache.read("a"*10000)
   end
 
+  def test_long_uri_encoded_keys
+    @cache.write("%"*870, 1)
+    assert_equal 1, @cache.read("%"*870)
+  end
+
   def test_key_transformation
     key = @cache.send(:key_file_path, "views/index?id=1")
     assert_equal "views/index?id=1", @cache.send(:file_path_key, key)