Permalink
Browse files

Fix 1.9.2 failures.

  • Loading branch information...
1 parent c3c6f58 commit 54b09e17d4527bb4e5508d7dcb286040c3e3ea3f @josevalim josevalim committed Oct 8, 2010
Showing with 4 additions and 4 deletions.
  1. +4 −4 actionpack/test/template/template_test.rb
View
8 actionpack/test/template/template_test.rb
@@ -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

0 comments on commit 54b09e1

Please sign in to comment.