Merge pull request #469 from glebglazov/fixing-cas

Fixing CAS for Dalli adapter
Shopify · Jan 8, 2021 · 423aa50 · 423aa50
2 parents 1838e72 + c83e461
commit 423aa50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/identity_cache/mem_cache_store_cas.rb b/lib/identity_cache/mem_cache_store_cas.rb
@@ -44,7 +44,7 @@ def cas_multi(*names, **options)
             cas_id = raw_values[key].last
             entry = ActiveSupport::Cache::Entry.new(value, **options)
             payload = options[:raw] ? entry.value.to_s : entry
-            @data.replace_cas(key, payload, options[:expires_in].to_i, cas_id, options)
+            @data.replace_cas(key, payload, cas_id, options[:expires_in].to_i, options)
           end
         end
       end

diff --git a/test/helpers/cache_connection.rb b/test/helpers/cache_connection.rb
@@ -19,7 +19,7 @@ def backend
     @backend ||= case ENV['ADAPTER']
     when nil, 'dalli'
       require 'active_support/cache/mem_cache_store'
-      ActiveSupport::Cache::MemCacheStore.new("#{host}:11211", failover: false)
+      ActiveSupport::Cache::MemCacheStore.new("#{host}:11211", failover: false, expires_in: 6.hours.to_i)
     when 'memcached'
       require 'memcached_store'
       require 'active_support/cache/memcached_store'