diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-01-09 10:13:08 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-01-09 10:13:08 +0900 |
| commit | b369f5e8a2c1e4bc90c561365d42dc5674f83d6e (patch) | |
| tree | d2582e0674bf5fe3359f7581de8d2feb470f9619 /test | |
| parent | d254d5563e0e599f25aca9507683ee0abb9e18de (diff) | |
| download | ruby-b369f5e8a2c1e4bc90c561365d42dc5674f83d6e.tar.gz | |
Fixed up 0eeed5bcc5530edb0af2af2ccff09d067c59e8f9
`Binding#source_location` returns the `__FILE__` when created, and
may not be an absolute or real path. And in the `eval` context
with an explicit file name, `__dir__` also returns that name.
On the other hand, `__FILE__` in `require`d script file has been
expanded at searching the library.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_method.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 207be5099b..7577a53b7a 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -790,7 +790,9 @@ class TestMethod < Test::Unit::TestCase assert_instance_of String, __dir__ assert_equal(File.dirname(File.realpath(__FILE__)), __dir__) bug8436 = '[ruby-core:55123] [Bug #8436]' - assert_equal(__dir__, eval("__dir__", binding, *binding.source_location), bug8436) + file, line = *binding.source_location + file = File.realpath(file) + assert_equal(__dir__, eval("__dir__", binding, file, line), bug8436) bug8662 = '[ruby-core:56099] [Bug #8662]' assert_equal("arbitrary", eval("__dir__", binding, "arbitrary/file.rb"), bug8662) assert_equal("arbitrary", Object.new.instance_eval("__dir__", "arbitrary/file.rb"), bug8662) |