[api] make use memcached in test environment

but make sure not to reuse old caches
openSUSE · Oct 18, 2013 · 5ffc4a1 · 5ffc4a1
1 parent 23d1512
commit 5ffc4a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/api/config/environments/test.rb b/src/api/config/environments/test.rb
@@ -1,5 +1,7 @@
 # Settings specified here will take precedence over those in config/environment.rb
 
+ENV['CACHENAMESPACE'] ||= "obs-api-test-#{Time.now.to_i}"
+
 OBSApi::Application.configure do
 
   # The test environment is used exclusively to run your application's
@@ -18,7 +20,7 @@
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  config.cache_store = :null_store
+  config.cache_store = :dalli_store, '127.0.0.1:11211', {namespace: ENV['CACHENAMESPACE'], expires_in: 1.hour }
 
   config.active_support.deprecation = :log
 

diff --git a/src/api/config/initializers/session_store.rb b/src/api/config/initializers/session_store.rb
@@ -1,6 +1,2 @@
 # cookies are too small and active record sessions cause too much load
-if Rails.env.test?
-  Rails.application.config.session_store ActionDispatch::Session::CookieStore
-else
-  Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 1.day
-end
+Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 1.day