Permalink
Browse files

Merge pull request #7485 from kennyj/fix_build_20120830

Fix build about TemplateDigestorTest.
  • Loading branch information...
2 parents 66c31dd + 5225c1a commit 404ddd286000246953190c1805f1290dd4a1939d @rafaelfranca rafaelfranca committed Aug 30, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionpack/test/template/digestor_test.rb
@@ -16,7 +16,7 @@ class FixtureFinder
TMP_DIR = "#{File.dirname(__FILE__)}/../tmp"
def find(logical_name, keys, partial, options)
- FixtureTemplate.new("#{TMP_DIR}/#{partial ? logical_name.gsub(%r|/([^/]+)$|, '/_\1') : logical_name}.#{options[:formats].first}.erb")
+ FixtureTemplate.new("#{TMP_DIR}/digestor/#{partial ? logical_name.gsub(%r|/([^/]+)$|, '/_\1') : logical_name}.#{options[:formats].first}.erb")
end
end
@@ -26,7 +26,7 @@ def setup
end
def teardown
- FileUtils.rm_r FixtureFinder::TMP_DIR
+ FileUtils.rm_r File.join(FixtureFinder::TMP_DIR, "digestor")
ActionView::Digestor.cache.clear
end
@@ -150,7 +150,7 @@ def digest(template_name)
end
def change_template(template_name)
- File.open("#{FixtureFinder::TMP_DIR}/#{template_name}.html.erb", "w") do |f|
+ File.open("#{FixtureFinder::TMP_DIR}/digestor/#{template_name}.html.erb", "w") do |f|
f.write "\nTHIS WAS CHANGED!"
end
end

0 comments on commit 404ddd2

Please sign in to comment.