Changeset 8744

Timestamp:

01/27/08 20:48:13 (9 months ago)

Author:

nzkoz

Message:

Correct line numbers from template errors. Closes #10937 [Aleksey Kondratenko]

Files:

• trunk/actionpack/lib/action_view/template_handlers/compilable.rb (modified) (1 diff)
• trunk/actionpack/test/controller/render_test.rb (modified) (2 diffs)

trunk/actionpack/lib/action_view/template_handlers/compilable.rb

@@ -26 +26 @@
-        begin
-          file_name = 'compiled-template' if file_name.blank?
-
+-
-        rescue Exception => e  # errors from template code
-          if @view.logger

trunk/actionpack/test/controller/render_test.rb

@@ -85 +85 @@
-  def render_xml_with_custom_content_type
-    render :xml => "<blah/>", :content_type => "application/atomsvc+xml"
+  end
+
+  def render_line_offset
+    begin
+      render :inline => '<% raise %>', :locals => {:foo => 'bar'}
+    rescue => exc
+    end
+    line = exc.backtrace.first
+    render :text => line
-  end
-
@@ -226 +235 @@
-  end
-
+  def test_line_offset
+    get :render_line_offset
+    line = @response.body
+    assert(line =~ %r{:(\d+):})
+    assert_equal "1", $1
+  end
+
-  def test_render_with_forward_slash
-    get :render_hello_world_with_forward_slash