aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-10-08 09:24:06 +0200
committerJosé Valim <jose.valim@gmail.com>2010-10-08 09:24:06 +0200
commit54b09e17d4527bb4e5508d7dcb286040c3e3ea3f (patch)
treeb12a37268287c7f23ca76fe8f1122ada34cbdb05 /actionpack
parentc3c6f58ffb4a27f843378d4cce45c52831fb2e37 (diff)
downloadrails-54b09e17d4527bb4e5508d7dcb286040c3e3ea3f.tar.gz
rails-54b09e17d4527bb4e5508d7dcb286040c3e3ea3f.tar.bz2
rails-54b09e17d4527bb4e5508d7dcb286040c3e3ea3f.zip
Fix 1.9.2 failures.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/template/template_test.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 210ba673f0..27b42006e3 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -32,8 +32,8 @@ class TestERBTemplate < ActiveSupport::TestCase
end
end
- def new_template(body = "<%= hello %>", handler = ERBHandler, details = {})
- ActionView::Template.new(body, "hello template", ERBHandler, {:virtual_path => "hello"})
+ def new_template(body = "<%= hello %>", details = {})
+ ActionView::Template.new(body, "hello template", ERBHandler, {:virtual_path => "hello"}.merge!(details))
end
def render(locals = {})
@@ -102,7 +102,7 @@ class TestERBTemplate < ActiveSupport::TestCase
# inside Rails.
def test_lying_with_magic_comment
assert_raises(ActionView::Template::Error) do
- @template = new_template("# encoding: UTF-8\nhello \xFCmlat")
+ @template = new_template("# encoding: UTF-8\nhello \xFCmlat", :virtual_path => nil)
render
end
end
@@ -118,7 +118,7 @@ class TestERBTemplate < ActiveSupport::TestCase
def test_error_when_template_isnt_valid_utf8
assert_raises(ActionView::Template::Error, /\xFC/) do
- @template = new_template("hello \xFCmlat")
+ @template = new_template("hello \xFCmlat", :virtual_path => nil)
render
end
end