Refactor #33254.

Firstly, increment and decrement shouldn't care about the particulars of
key expiry. They should only know that they have to pass that responsibility
on to somewhere else.

Secondly, it moves the key normalization back inside the instrumentation like
it was originally. I think that matches the original design intention or at
the very least it lets users catch haywire key truncation.

Thirdly, it moves the changelog entry to the top of the file, where new entries
go. I couldn't understand what the entry was saying so I tried to rewrite it.

1 files changed, 2 insertions, 2 deletions

diff --git a/activesupport/test/cache/stores/redis_cache_store_test.rb b/activesupport/test/cache/stores/redis_cache_store_test.rb
index 845254ac69..3b873de383 100644
--- a/activesupport/test/cache/stores/redis_cache_store_test.rb
+++ b/activesupport/test/cache/stores/redis_cache_store_test.rb
@@ -152,7 +152,7 @@ module ActiveSupport::Cache::RedisCacheStoreTests
       # key and ttl exist
       @cache.redis.setex "#{@namespace}:bar", 120, 1
       assert_not_called @cache.redis, :expire do
-        @cache.increment "bar", 1, expires_in: 120
+        @cache.increment "bar", 1, expires_in: 2.minutes
       end
 
       # key exist but not have expire
@@ -172,7 +172,7 @@ module ActiveSupport::Cache::RedisCacheStoreTests
       # key and ttl exist
       @cache.redis.setex "#{@namespace}:bar", 120, 1
       assert_not_called @cache.redis, :expire do
-        @cache.decrement "bar", 1, expires_in: 120
+        @cache.decrement "bar", 1, expires_in: 2.minutes
       end
 
       # key exist but not have expire