From b537823f3d1f7ad0eb4f05b68b21a3c9a0a0d295 Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 4 Apr 2018 03:27:20 +0000
Subject: [PATCH] rexml: Fix a XPath bug of @attribute/parent

[Bug #14600]

* lib/rexml/functions.rb: Fix a bug that "@attribute/parent" doesn't
  return element of its attribute.

* test/rexml/test_jaxen.rb: Enable more tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rexml/xpath_parser.rb | 12 ++++++++++--
 test/rexml/test_jaxen.rb  | 10 +++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
index 6a32a06440..cab32b3a37 100644
--- a/lib/rexml/xpath_parser.rb
+++ b/lib/rexml/xpath_parser.rb
@@ -236,8 +236,16 @@ module REXML
           nodeset = new_nodeset
 
         when :parent
-          nodeset = nodeset.collect{|n| n.parent}.compact
-          #nodeset = expr(path_stack.dclone, nodeset.collect{|n| n.parent}.compact)
+          new_nodeset = []
+          nodeset.each do |node|
+            if node.is_a?(Attribute)
+              parent = node.element
+            else
+              parent = node.parent
+            end
+            new_nodeset << parent if parent
+          end
+          nodeset = new_nodeset
           node_types = ELEMENTS
 
         when :ancestor
diff --git a/test/rexml/test_jaxen.rb b/test/rexml/test_jaxen.rb
index 1efec69b32..069a24e359 100644
--- a/test/rexml/test_jaxen.rb
+++ b/test/rexml/test_jaxen.rb
@@ -18,9 +18,9 @@ module REXMLTests
     def test_contents ; process_test_case("contents") ; end
     def test_defaultNamespace ; process_test_case("defaultNamespace") ; end
     def test_fibo ; process_test_case("fibo") ; end
-    def _test_id ; process_test_case("id") ; end
-    def _test_jaxen24 ; process_test_case("jaxen24") ; end
-    def _test_lang ; process_test_case("lang") ; end
+    def test_id ; process_test_case("id") ; end
+    def test_jaxen24 ; process_test_case("jaxen24") ; end
+    def test_lang ; process_test_case("lang") ; end
     def _test_message ; process_test_case("message") ; end
     def _test_moreover ; process_test_case("moreover") ; end
     def _test_much_ado ; process_test_case("much_ado") ; end
@@ -111,8 +111,8 @@ module REXMLTests
 
     # processes a tests/document/context/test node ( where @exception is false or doesn't exist )
     def process_nominal_test(context, variables, namespaces, test)
-      select = test.attributes["select"]
-      matched = XPath.match(context, select, namespaces, variables)
+      xpath = test.attributes["select"]
+      matched = XPath.match(context, xpath, namespaces, variables)
       # might be a test with no count attribute, but nested valueOf elements
       expected = test.attributes["count"]
       if expected