diff options
author | Jeremy Evans <code@jeremyevans.net> | 2019-07-30 16:15:19 -0700 |
---|---|---|
committer | Jeremy Evans <code@jeremyevans.net> | 2020-01-03 20:13:09 -0800 |
commit | 0eeed5bcc5530edb0af2af2ccff09d067c59e8f9 (patch) | |
tree | 7a3aceb0e9ddc67ab4ca1dfe4534eb1515aa49c6 /test/ruby/test_eval.rb | |
parent | 170f4dbb9bf9363c9fd012fc3f4e340ccda43273 (diff) |
Make eval(code, binding) use (eval) as __FILE__ and 1 as __LINE__
This removes the warning that was added in
3802fb92ff8c83eed3e867db20f72c53932f542d, and switches the behavior
so that the eval does not use the binding's __FILE__ and __LINE__
implicitly.
Fixes [Bug #4352]
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2816
Diffstat (limited to 'test/ruby/test_eval.rb')
-rw-r--r-- | test/ruby/test_eval.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb index 3d6116edbc..b1cb562175 100644 --- a/test/ruby/test_eval.rb +++ b/test/ruby/test_eval.rb @@ -470,9 +470,12 @@ class TestEval < Test::Unit::TestCase end def test_eval_location_binding - assert_warning(/__FILE__ in eval/) do - assert_equal(__FILE__, eval("__FILE__", binding)) - end + assert_equal(['(eval)', 1], eval("[__FILE__, __LINE__]", nil)) + assert_equal(['(eval)', 1], eval("[__FILE__, __LINE__]", binding)) + assert_equal(['foo', 1], eval("[__FILE__, __LINE__]", nil, 'foo')) + assert_equal(['foo', 1], eval("[__FILE__, __LINE__]", binding, 'foo')) + assert_equal(['foo', 2], eval("[__FILE__, __LINE__]", nil, 'foo', 2)) + assert_equal(['foo', 2], eval("[__FILE__, __LINE__]", binding, 'foo', 2)) end def test_fstring_instance_eval |