Merge branch 'master' into custom-discarded-job-handling

3 files changed, 168 insertions, 0 deletions

diff --git a/activesupport/test/cache/stores/file_store_test.rb b/activesupport/test/cache/stores/file_store_test.rb
index 391ab60b3a..66231b0a82 100644
--- a/activesupport/test/cache/stores/file_store_test.rb
+++ b/activesupport/test/cache/stores/file_store_test.rb
@@ -118,6 +118,7 @@ class FileStoreTest < ActiveSupport::TestCase
       assert_not @cache.exist?("foo")
       assert @cache.exist?("baz")
       assert @cache.exist?("quux")
+      assert_equal 2, Dir.glob(File.join(cache_dir, "**")).size
     end
   end
 
diff --git a/activesupport/test/cache/stores/mem_cache_store_test.rb b/activesupport/test/cache/stores/mem_cache_store_test.rb
index 1b73fb65eb..99624caf8a 100644
--- a/activesupport/test/cache/stores/mem_cache_store_test.rb
+++ b/activesupport/test/cache/stores/mem_cache_store_test.rb
@@ -57,6 +57,22 @@ class MemCacheStoreTest < ActiveSupport::TestCase
     end
   end
 
+  def test_increment_expires_in
+    cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, raw: true)
+    cache.clear
+    assert_called_with cache.instance_variable_get(:@data), :incr, [ "foo", 1, 60 ] do
+      cache.increment("foo", 1, expires_in: 60)
+    end
+  end
+
+  def test_decrement_expires_in
+    cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, raw: true)
+    cache.clear
+    assert_called_with cache.instance_variable_get(:@data), :decr, [ "foo", 1, 60 ] do
+      cache.decrement("foo", 1, expires_in: 60)
+    end
+  end
+
   def test_local_cache_raw_values_with_marshal
     cache = ActiveSupport::Cache.lookup_store(:mem_cache_store, raw: true)
     cache.clear
diff --git a/activesupport/test/cache/stores/redis_cache_store_test.rb b/activesupport/test/cache/stores/redis_cache_store_test.rb
new file mode 100644
index 0000000000..988de9207f
--- /dev/null
+++ b/activesupport/test/cache/stores/redis_cache_store_test.rb
@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+require "active_support/cache"
+require "active_support/cache/redis_cache_store"
+require_relative "../behaviors"
+
+module ActiveSupport::Cache::RedisCacheStoreTests
+  class LookupTest < ActiveSupport::TestCase
+    test "may be looked up as :redis_cache_store" do
+      assert_kind_of ActiveSupport::Cache::RedisCacheStore,
+        ActiveSupport::Cache.lookup_store(:redis_cache_store)
+    end
+  end
+
+  class InitializationTest < ActiveSupport::TestCase
+    test "omitted URL uses Redis client with default settings" do
+      assert_called_with Redis, :new, [
+        url: nil,
+        connect_timeout: 20, read_timeout: 1, write_timeout: 1,
+        reconnect_attempts: 0,
+      ] do
+        build
+      end
+    end
+
+    test "no URLs uses Redis client with default settings" do
+      assert_called_with Redis, :new, [
+        url: nil,
+        connect_timeout: 20, read_timeout: 1, write_timeout: 1,
+        reconnect_attempts: 0,
+      ] do
+        build url: []
+      end
+    end
+
+    test "singular URL uses Redis client" do
+      assert_called_with Redis, :new, [
+        url: "redis://localhost:6379/0",
+        connect_timeout: 20, read_timeout: 1, write_timeout: 1,
+        reconnect_attempts: 0,
+      ] do
+        build url: "redis://localhost:6379/0"
+      end
+    end
+
+    test "one URL uses Redis client" do
+      assert_called_with Redis, :new, [
+        url: "redis://localhost:6379/0",
+        connect_timeout: 20, read_timeout: 1, write_timeout: 1,
+        reconnect_attempts: 0,
+      ] do
+        build url: %w[ redis://localhost:6379/0 ]
+      end
+    end
+
+    test "multiple URLs uses Redis::Distributed client" do
+      assert_called_with Redis, :new, [
+        [ url: "redis://localhost:6379/0",
+          connect_timeout: 20, read_timeout: 1, write_timeout: 1,
+          reconnect_attempts: 0 ],
+        [ url: "redis://localhost:6379/1",
+          connect_timeout: 20, read_timeout: 1, write_timeout: 1,
+          reconnect_attempts: 0 ],
+      ], returns: Redis.new do
+        @cache = build url: %w[ redis://localhost:6379/0 redis://localhost:6379/1 ]
+        assert_kind_of ::Redis::Distributed, @cache.redis
+      end
+    end
+
+    test "block argument uses yielded client" do
+      block = -> { :custom_redis_client }
+      assert_called block, :call do
+        build redis: block
+      end
+    end
+
+    private
+      def build(**kwargs)
+        ActiveSupport::Cache::RedisCacheStore.new(**kwargs).tap do |cache|
+          cache.redis
+        end
+      end
+  end
+
+  class StoreTest < ActiveSupport::TestCase
+    setup do
+      @namespace = "namespace"
+
+      @cache = ActiveSupport::Cache::RedisCacheStore.new(timeout: 0.1, namespace: @namespace, expires_in: 60)
+      #@cache.logger = Logger.new($stdout)  # For test debugging
+
+      # For LocalCacheBehavior tests
+      @peek = ActiveSupport::Cache::RedisCacheStore.new(timeout: 0.1, namespace: @namespace)
+    end
+
+    teardown do
+      @cache.clear
+      @cache.redis.disconnect!
+    end
+  end
+
+  class RedisCacheStoreCommonBehaviorTest < StoreTest
+    include CacheStoreBehavior
+    include CacheStoreVersionBehavior
+    include LocalCacheBehavior
+    include CacheIncrementDecrementBehavior
+    include AutoloadingCacheBehavior
+  end
+
+  # Separate test class so we can omit the namespace which causes expected,
+  # appropriate complaints about incompatible string encodings.
+  class KeyEncodingSafetyTest < StoreTest
+    include EncodedKeyCacheBehavior
+
+    setup do
+      @cache = ActiveSupport::Cache::RedisCacheStore.new(timeout: 0.1)
+      @cache.logger = nil
+    end
+  end
+
+  class StoreAPITest < StoreTest
+  end
+
+  class FailureSafetyTest < StoreTest
+    test "fetch read failure returns nil" do
+    end
+
+    test "fetch read failure does not attempt to write" do
+    end
+
+    test "write failure returns nil" do
+    end
+  end
+
+  class DeleteMatchedTest < StoreTest
+    test "deletes keys matching glob" do
+      @cache.write("foo", "bar")
+      @cache.write("fu", "baz")
+      @cache.delete_matched("foo*")
+      assert !@cache.exist?("foo")
+      assert @cache.exist?("fu")
+    end
+
+    test "fails with regexp matchers" do
+      assert_raise ArgumentError do
+        @cache.delete_matched(/OO/i)
+      end
+    end
+  end
+end