From 363bf6cdee08e517021ff90082b9b36b7fa65b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Fri, 12 Jan 2018 16:15:55 +0100
Subject: [PATCH] Add support for Ruby 2.5.

---
 test/test-main.rb        | 17 +++++++++++++++++
 test/test-users-guide.rb |  2 +-
 test/testutil.rb         |  6 +++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/test/test-main.rb b/test/test-main.rb
index 14a4bf8..212882d 100644
--- a/test/test-main.rb
+++ b/test/test-main.rb
@@ -298,6 +298,23 @@ END
 END
       errmsgs << <<'END'
 7: syntax error, unexpected end-of-input, expecting keyword_end
+END
+    elsif ruby25?
+      errmsgs << <<'END'
+3: syntax error, unexpected ']', expecting ')'
+...  <li>'; _buf << ( item[:name]] ).to_s; _buf << '</li>
+...                              ^
+-:4: syntax error, unexpected keyword_end, expecting ')'
+'; end 
+   ^~~
+-:7: syntax error, unexpected end-of-input, expecting ')'
+_buf.to_s
+         ^
+END
+      errmsgs << <<'END'
+7: syntax error, unexpected end-of-input, expecting keyword_end
+_buf.to_s
+         ^
 END
     elsif rubinius?
       errmsgs << <<'END'
diff --git a/test/test-users-guide.rb b/test/test-users-guide.rb
index 7ce94bf..c1c52af 100644
--- a/test/test-users-guide.rb
+++ b/test/test-users-guide.rb
@@ -28,7 +28,7 @@ class KwarkUsersGuideTest < Test::Unit::TestCase
     s =~ /\A\$ (.*?)\n/
     command = $1
     expected = $'
-    if ruby19? || ruby20? || ruby21? || ruby22? || ruby23? || ruby24?
+    if ruby19? || ruby20? || ruby21? || ruby22? || ruby23? || ruby24? || ruby25?
       case @name
       when 'test_main_program1_result'
         expected.sub!('["eruby", "items", "x", "_buf"]', '[:_buf, :eruby, :items, :x]')
diff --git a/test/testutil.rb b/test/testutil.rb
index 68518b0..1005d31 100644
--- a/test/testutil.rb
+++ b/test/testutil.rb
@@ -37,6 +37,10 @@ def ruby24?  # :nodoc:
   RUBY_VERSION =~ /\A2.4/
 end
 
+def ruby25?  # :nodoc:
+  RUBY_VERSION =~ /\A2.5/
+end
+
 def rubinius?  # :nodoc:
   defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
 end
@@ -57,7 +61,7 @@ class Test::Unit::TestCase
     s = _untabify(s) unless options[:tabify] == false
     # load yaml document
     testdata_list = []
-    YAML.load_documents(s) do |ydoc|
+    YAML.load_stream(s) do |ydoc|
       if ydoc.is_a?(Hash)
         testdata_list << ydoc
       elsif ydoc.is_a?(Array)
-- 
2.15.1