1 files changed, 19 insertions, 0 deletions
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index 65efd39191..107ad1a0da 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -39,6 +39,25 @@ class TestERB < Test::Unit::TestCase
     assert_match(/\Atest filename:1\b/, e.backtrace[0])
   end
 
+  def test_with_filename_lineno
+    erb = ERB.new("<% raise ::TestERB::MyError %>")
+    erb.filename = "test filename"
+    erb.lineno = 100
+    e = assert_raise(MyError) {
+      erb.result
+    }
+    assert_match(/\Atest filename:101\b/, e.backtrace[0])
+  end
+
+  def test_with_location
+    erb = ERB.new("<% raise ::TestERB::MyError %>")
+    erb.location = ["test filename", 200]
+    e = assert_raise(MyError) {
+      erb.result
+    }
+    assert_match(/\Atest filename:201\b/, e.backtrace[0])
+  end
+
   def test_html_escape
     assert_equal(" !&quot;\#$%&amp;&#39;()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
                  ERB::Util.html_escape(" !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"))