[前][次][番号順一覧][スレッド一覧]

ruby-changes:64964

From: Takashi <ko1@a...>
Date: Wed, 20 Jan 2021 17:47:05 +0900 (JST)
Subject: [ruby-changes:64964] 10d12afa41 (master): [ruby/erb] Prefer __dir__ to reduce ../

https://git.ruby-lang.org/ruby.git/commit/?id=10d12afa41

From 10d12afa4181e4c9052b6df29926c99de6dd2409 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Wed, 20 Jan 2021 00:46:32 -0800
Subject: [ruby/erb] Prefer __dir__ to reduce ../

https://github.com/ruby/erb/commit/cb59f11ec8

diff --git a/test/erb/test_erb_command.rb b/test/erb/test_erb_command.rb
index a440045..a8ad5ab 100644
--- a/test/erb/test_erb_command.rb
+++ b/test/erb/test_erb_command.rb
@@ -6,7 +6,7 @@ class TestErbCommand < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/erb/test_erb_command.rb#L6
   def test_var
     pend 'this test has not supported Ruby 2.5' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
     assert_in_out_err(["-w",
-                       File.expand_path("../../../libexec/erb", __FILE__),
+                       File.expand_path("../../libexec/erb", __dir__),
                        "var=hoge"],
                       "<%=var%>", ["hoge"])
   end
@@ -14,7 +14,7 @@ class TestErbCommand < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/erb/test_erb_command.rb#L14
   def test_template_file_encoding
     pend 'this test has not supported Ruby 2.5' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
     assert_in_out_err(["-w",
-                       File.expand_path("../../../libexec/erb", __FILE__)],
+                       File.expand_path("../../libexec/erb", __dir__)],
                       "<%=''.encoding.to_s%>", ["UTF-8"])
   end
 
@@ -26,7 +26,7 @@ class TestErbCommand < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/erb/test_erb_command.rb#L26
       /\n.+\/libexec\/erb:\d+: warning: Passing safe_level with the 2nd argument of ERB\.new is deprecated\. Do not use it, and specify other arguments as keyword arguments\.\n/,
     ]
     assert_in_out_err(["-w",
-                       File.expand_path("../../../libexec/erb", __FILE__),
+                       File.expand_path("../../libexec/erb", __dir__),
                        "-S", "0"],
                       "hoge", ["hoge"], warnings)
   end
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]