Merge pull request #359 from alexandergraul/fix/distribution-list-cac…

…hing don't force cache misses
openSUSE · Jul 5, 2018 · 9def587 · 9def587
2 parents 45b0499 + 3a4ef40
commit 9def587
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/obs_controller.rb b/app/controllers/obs_controller.rb
@@ -8,9 +8,7 @@ class OBSController < ApplicationController
   before_action :set_releases_parameters
 
   def set_distributions
-    @distributions = Rails.cache.fetch('distributions',
-                                       expires_in: 120.minutes,
-                                       force: true) do
+    @distributions = Rails.cache.fetch('distributions', expires_in: 120.minutes) do
       load_distributions
     end
   rescue OBSError

diff --git a/test/integration/obs_controller_test.rb b/test/integration/obs_controller_test.rb
@@ -16,6 +16,8 @@ def mock.get
     end
 
     ApiConnect.stub :get, mock do
+      # Otherwise the controller would get the distributions from cache
+      Rails.cache.clear
       get '/explore'
       assert_includes body, 'Connection to OBS is unavailable.'
       assert_equal 200, status