Merged r9711 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9724 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-05-26 09:50:01 +00:00
parent 743b55a3f9
commit 955d2b134d
2 changed files with 2 additions and 1 deletions

View File

@ -43,7 +43,7 @@ module ActionView
end
end
ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe }
require 'mail'

View File

@ -149,6 +149,7 @@ class QueriesControllerTest < ActionController::TestCase
end
assert_response :success
assert_template 'new'
assert_select 'input[name=?]', 'query[name]'
end
def test_edit_global_public_query