[bugfix] to pass test on Ruby 1.9

2 files changed, 24 insertions, 0 deletions

diff --git a/test/test-users-guide.rb b/test/test-users-guide.rb
index d3d6e4c..f830665 100644
--- a/test/test-users-guide.rb
+++ b/test/test-users-guide.rb
@@ -28,6 +28,14 @@ class KwarkUsersGuideTest < Test::Unit::TestCase
     s =~ /\A\$ (.*?)\n/
     command = $1
     expected = $'
+    ruby19 do
+      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]')
+      end
+    end
     result = `#{command}`
     assert_text_equal(expected, result)
   end
diff --git a/test/test.rb b/test/test.rb
index 96b76ba..04d8865 100644
--- a/test/test.rb
+++ b/test/test.rb
@@ -20,6 +20,22 @@ require 'testutil'
 require 'erubis'
 
 
+Test::Unit::TestCase.class_eval do
+  if RUBY_VERSION >= "1.9"
+    ## minitest doesn't have 'name()' method
+    def name
+      @name || @__name__
+    end
+    def ruby19
+      yield
+    end
+  else
+    def ruby19
+    end
+  end
+end
+
+
 if $0 == __FILE__
   require "#{TESTDIR}/test-erubis.rb"
   require "#{TESTDIR}/test-engines.rb"