escaped XML text content with htmlspecialschars Codeception#2775

Naktibalda · Feb 8, 2016 · fafa6f6 · fafa6f6
1 parent 4dec9be
commit fafa6f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Codeception/Util/JsonArray.php b/src/Codeception/Util/JsonArray.php
@@ -211,7 +211,7 @@ private function arrayToXml(\DOMDocument $doc, \DOMNode $node, $array)
             if (is_array($value)) {
                 $this->arrayToXml($doc, $subNode, $value);
             } else {
-                $subNode->nodeValue = (string)$value;
+                $subNode->nodeValue = htmlspecialchars((string)$value);
             }
         }
     }

diff --git a/tests/unit/Codeception/Module/RestTest.php b/tests/unit/Codeception/Module/RestTest.php
@@ -241,6 +241,16 @@ public function testArrayJsonPathAndXPath()
         $this->module->dontSeeResponseJsonMatchesJsonPath('$[*].profile');
     }
 
+    /**
+     * @Issue https://github.com/Codeception/Codeception/issues/2775
+     */
+    public function testSeeResponseJsonMatchesXPathWorksWithAmpersand()
+    {
+        $this->setStubResponse('{ "product":[ { "category":[ { "comment":"something & something" } ] } ] }');
+        $this->module->seeResponseIsJson();
+        $this->module->seeResponseJsonMatchesXpath('//comment');
+    }
+
 
     public function testArrayJsonPathFails()
     {