kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Fix 1.9.2 failures.

This commit is contained in:
José Valim 2010-10-08 09:24:06 +02:00
parent c3c6f58ffb
commit 54b09e17d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actionpack/test/template/template_test.rb
View File

@ -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