From 4a2867abe169c563e463f749923a7dbed640c409 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 11 Dec 2012 10:14:08 +0000 Subject: merge revision(s) 37594: [Backport #7046] * lib/erb.rb (ERB#run, ERB#result): eval under isolated bindings for safe concurrent use. [ruby-core:47638] [Bug #7046] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/erb/test_erb.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'test') diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index 05d255623a..6fe59a68b6 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -1,3 +1,4 @@ +# -*- coding: us-ascii -*- require 'test/unit' require 'erb' @@ -37,6 +38,15 @@ class TestERB < Test::Unit::TestCase } assert_match(/\Atest filename:1\b/, e.backtrace[0]) end + + def test_concurrent_default_binding + template1 = 'one <%= ERB.new(template2).result %>' + + eval 'template2 = "two"', TOPLEVEL_BINDING + + bug7046 = '[ruby-core:47638]' + assert_equal("one two", ERB.new(template1).result, bug7046) + end end class TestERBCore < Test::Unit::TestCase -- cgit v1.2.3