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

ruby-changes:64973

From: Takashi <ko1@a...>
Date: Thu, 21 Jan 2021 13:12:17 +0900 (JST)
Subject: [ruby-changes:64973] 47b43807a8 (master): [ruby/erb] Make sure erb.rb in this repository is tested

https://git.ruby-lang.org/ruby.git/commit/?id=47b43807a8

From 47b43807a86bd29e4e275aaf23228cd78adf696e Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Wed, 20 Jan 2021 20:11:04 -0800
Subject: [ruby/erb] Make sure erb.rb in this repository is tested

https://github.com/ruby/erb/commit/012faba2e5

diff --git a/test/erb/test_erb_command.rb b/test/erb/test_erb_command.rb
index a8ad5ab..0baa59d 100644
--- a/test/erb/test_erb_command.rb
+++ b/test/erb/test_erb_command.rb
@@ -4,28 +4,25 @@ require 'test/unit' https://github.com/ruby/ruby/blob/trunk/test/erb/test_erb_command.rb#L4
 
 class TestErbCommand < Test::Unit::TestCase
   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",
+    assert_in_out_err(["-I#{File.expand_path('../../lib', __dir__)}", "-w",
                        File.expand_path("../../libexec/erb", __dir__),
                        "var=hoge"],
                       "<%=var%>", ["hoge"])
   end
 
   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",
+    assert_in_out_err(["-I#{File.expand_path('../../lib', __dir__)}", "-w",
                        File.expand_path("../../libexec/erb", __dir__)],
                       "<%=''.encoding.to_s%>", ["UTF-8"])
   end
 
   # These interfaces will be removed at Ruby 2.7.
   def test_deprecated_option
-    pend 'this test has not supported Ruby 2.5' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
     warnings = [
       "warning: -S option of erb command is deprecated. Please do not use this.",
       /\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",
+    assert_in_out_err(["-I#{File.expand_path('../../lib', __dir__)}", "-w",
                        File.expand_path("../../libexec/erb", __dir__),
                        "-S", "0"],
                       "hoge", ["hoge"], warnings)
-- 
cgit v0.10.2


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

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