aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-30 08:10:28 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-30 08:10:28 -0700
commit404ddd286000246953190c1805f1290dd4a1939d (patch)
tree31a99933897c99dfea5d35be3911b264744593ac /actionpack
parent66c31dd2b8b50090b48fecf8d39b706d3f4eb8c8 (diff)
parent5225c1a47273621e54f6841db98ac7a1c2ebacc7 (diff)
downloadrails-404ddd286000246953190c1805f1290dd4a1939d.tar.gz
rails-404ddd286000246953190c1805f1290dd4a1939d.tar.bz2
rails-404ddd286000246953190c1805f1290dd4a1939d.zip
Merge pull request #7485 from kennyj/fix_build_20120830
Fix build about TemplateDigestorTest.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/template/digestor_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/template/digestor_test.rb b/actionpack/test/template/digestor_test.rb
index a53e335bb3..9c84f3107f 100644
--- a/actionpack/test/template/digestor_test.rb
+++ b/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 @@ class TemplateDigestorTest < ActionView::TestCase
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 @@ class TemplateDigestorTest < ActionView::TestCase
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