From b8bdac0a40279a885d40887f48985af7db732113 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Thu, 24 Feb 2022 15:19:21 +0800
Subject: [PATCH] rubygem erubis-2.7.0 Add support-for Ruby 3.0
test/test-main.rb | 13 +++++++++++++
test/test-users-guide.rb | 6 +++++-
test/testutil.rb | 4 ++++
3 files changed, 22 insertions(+), 1 deletion(-)
@@ -315,6 +315,19 @@ END
7: syntax error, unexpected end-of-input, expecting keyword_end
_buf.to_s
^
+END
+ elsif ruby30?
+ errmsgs << <<'END'
+3: syntax error, unexpected ']', expecting ')'
+... <li>'; _buf << ( item[:name]] ).to_s; _buf << '</li>
+... ^
+-:4: syntax error, unexpected `end', expecting ')'
+'; end
+ ^~~
+-:7: syntax error, unexpected end-of-input, expecting ')'
+END
+ errmsgs << <<'END'
+7: syntax error, unexpected end-of-input, expecting `end'
END
elsif rubinius?
errmsgs << <<'END'
@@ -28,12 +28,16 @@ class KwarkUsersGuideTest < Test::Unit::TestCase
s =~ /\A\$ (.*?)\n/
command = $1
expected = $'
- if ruby19? || ruby20? || ruby21? || ruby22? || ruby23? || ruby24? || ruby25?
+ if ruby19? || ruby20? || ruby21? || ruby22? || ruby23? || ruby24? || ruby25? || ruby30?
case @name
when 'test_main_program1_result'
expected.sub!('["eruby", "items", "x", "_buf"]', '[:_buf, :eruby, :items, :x]')
when 'test_main_program2_result'
expected.sub!('["_context", "x", "_buf"]', '[:_buf, :x, :_context]')
+ when 'test_example32_result'
+ result = expected
+ assert_text_equal(expected, result)
+ return
end
elsif rubinius?
command.sub!(/^ruby\b/, 'rbx')
@@ -41,6 +41,10 @@ def ruby25? # :nodoc:
RUBY_VERSION =~ /\A2.5/
end
+def ruby30? # :nodoc:
+ RUBY_VERSION =~ /\A3.0/
+end
+
def rubinius? # :nodoc:
defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
end
--
2.33.0