Move method to model to make it more testable, add spec.

3 files changed, 20 insertions, 8 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0c5f5bd02..4d3f40d40 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -189,14 +189,6 @@ class ApplicationController < ActionController::Base
         return File.join(File.split(path).map{|x| x[0...max_file_length]})
     end
 
-    def foi_fragment_cache_all_for_request(info_request)
-        # return stub path so admin can expire it
-        first_three_digits = info_request.id.to_s()[0..2]
-        path = "views/request/#{first_three_digits}/#{info_request.id}"
-        foi_cache_path = File.expand_path(File.join(File.dirname(__FILE__), '../../cache'))
-        return File.join(foi_cache_path, path)
-    end
-
     def foi_fragment_cache_exists?(key_path)
         return File.exists?(key_path)
     end
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index aed651ad3..121724424 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1048,6 +1048,14 @@ public
         File.join(Rails.root, "cache", "zips", "#{Rails.env}")
     end
 
+    def foi_fragment_cache_directory
+        # return stub path so admin can expire it
+        first_three_digits = id.to_s()[0..2]
+        path = "views/request/#{first_three_digits}/#{id}"
+        foi_cache_path = File.expand_path(File.join(File.dirname(__FILE__), '../../cache'))
+        return File.join(foi_cache_path, path)
+    end
+
     def request_dirs
         first_three_digits = id.to_s()[0..2]
         File.join(first_three_digits.to_s, id.to_s)
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index 12499f50a..3df99dd60 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -147,6 +147,18 @@ describe InfoRequest do
 
     end
 
+    describe 'when managing the cache path' do
+        before do
+            @info_request = info_requests(:fancy_dog_request)
+        end
+
+        it 'should return the default locale cache path without locale parts' do
+            default_locale_path = File.join(Rails.root, 'cache', 'views', 'request', '101', '101')
+            @info_request.foi_fragment_cache_directory.include?(default_locale_path).should == true
+        end
+
+    end
+
     describe " when emailing" do
 
         before do