Fix annotated typo

上级 da2c9237
......@@ -305,7 +305,7 @@ def log_error(exception)
logger.fatal do
message = +"\n#{exception.class} (#{exception.message}):\n"
message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
message << exception.annotated_source_code.to_s if exception.respond_to?(:annotated_source_code)
message << " " << exception.backtrace.join("\n ")
"#{message}\n\n"
end
......
......@@ -146,7 +146,7 @@ def log_error(request, wrapper)
message = []
message << " "
message << "#{exception.class} (#{exception.message}):"
message.concat(exception.annoted_source_code) if exception.respond_to?(:annoted_source_code)
message.concat(exception.annotated_source_code) if exception.respond_to?(:annotated_source_code)
message << " "
message.concat(trace)
......
......@@ -34,7 +34,7 @@ def log_error(exception)
return unless logger
message = +"\n#{exception.class} (#{exception.message}):\n"
message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
message << exception.annotated_source_code.to_s if exception.respond_to?(:annotated_source_code)
message << " " << exception.backtrace.join("\n ")
logger.fatal("#{message}\n\n")
end
......
......@@ -109,7 +109,7 @@ def line_number
end
end
def annoted_source_code
def annotated_source_code
source_extract(4)
end
......@@ -151,7 +151,7 @@ def message
MESSAGE
end
def annoted_source_code
def annotated_source_code
@offending_code_string.split("\n").map.with_index(1) { |line, index|
indentation = " " * 4
"#{index}:#{indentation}#{line}"
......
......@@ -262,7 +262,7 @@ def test_render_partial_with_hyphen_and_invalid_option_as
def test_render_template_with_syntax_error
e = assert_raises(ActionView::Template::Error) { @view.render(template: "test/syntax_error") }
assert_match %r!syntax!, e.message
assert_equal "1: <%= foo(", e.annoted_source_code[0].strip
assert_equal "1: <%= foo(", e.annotated_source_code[0].strip
end
def test_render_partial_with_errors
......@@ -270,13 +270,13 @@ def test_render_partial_with_errors
assert_match %r!method.*doesnt_exist!, e.message
assert_equal "", e.sub_template_message
assert_equal "1", e.line_number
assert_equal "1: <%= doesnt_exist %>", e.annoted_source_code[0].strip
assert_equal "1: <%= doesnt_exist %>", e.annotated_source_code[0].strip
assert_equal File.expand_path("#{FIXTURE_LOAD_PATH}/test/_raise.html.erb"), e.file_name
end
def test_render_error_indentation
e = assert_raises(ActionView::Template::Error) { @view.render(partial: "test/raise_indentation") }
error_lines = e.annoted_source_code
error_lines = e.annotated_source_code
assert_match %r!error\shere!, e.message
assert_equal "11", e.line_number
assert_equal " 9: <p>Ninth paragraph</p>", error_lines.second
......@@ -296,7 +296,7 @@ def test_render_file_with_errors
assert_match %r!method.*doesnt_exist!, e.message
assert_equal "", e.sub_template_message
assert_equal "1", e.line_number
assert_equal "1: <%= doesnt_exist %>", e.annoted_source_code[0].strip
assert_equal "1: <%= doesnt_exist %>", e.annotated_source_code[0].strip
assert_equal File.expand_path("#{FIXTURE_LOAD_PATH}/test/_raise.html.erb"), e.file_name
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册