提交 54b09e17 编写于 作者: J José Valim

Fix 1.9.2 failures.

上级 c3c6f58f
......@@ -32,8 +32,8 @@ def my_buffer
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 @@ def test_encoding_can_be_specified_with_magic_comment
# 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 @@ def test_encoding_can_be_specified_with_magic_comment_in_erb
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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册