IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Tests would fail if your test db's optimized image ids were high

Browse Source
This commit is contained in:
Robin Ward 2015-10-16 17:08:16 -04:00
parent 9e01a7d834
commit f155ff8270
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/file_store/base_store.rb
View File

@ -71,8 +71,12 @@ module FileStore
def purge_tombstone(grace_period) def purge_tombstone(grace_period)
end end
def get_depth_for(id)
[0, Math.log(id / 1_000.0, 16).ceil].max
end
def get_path_for(type, id, sha, extension) def get_path_for(type, id, sha, extension)
depth = [0, Math.log(id / 1_000.0, 16).ceil].max depth = get_depth_for(id)
tree = File.join(*sha[0, depth].split(""), "") tree = File.join(*sha[0, depth].split(""), "")
"#{type}/#{depth + 1}X/#{tree}#{sha}#{extension}" "#{type}/#{depth + 1}X/#{tree}#{sha}#{extension}"
end end

3
spec/components/cooked_post_processor_spec.rb
View File

@ -114,6 +114,8 @@ describe CookedPostProcessor do
# hmmm this should be done in a cleaner way # hmmm this should be done in a cleaner way
OptimizedImage.expects(:resize).returns(true) OptimizedImage.expects(:resize).returns(true)
FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
end end
it "generates overlay information" do it "generates overlay information" do
@ -141,6 +143,7 @@ describe CookedPostProcessor do
# hmmm this should be done in a cleaner way # hmmm this should be done in a cleaner way
OptimizedImage.expects(:resize).returns(true) OptimizedImage.expects(:resize).returns(true)
FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
end end
it "generates overlay information" do it "generates overlay information" do