Fix minkphp#9: Selenium2Driver::getValue returns "undefined" for <tex…

…tarea> URL: http://github.com/mekras/Mink/issues/issue/9
Behat · Apr 5, 2012 · abd7fbf · abd7fbf
1 parent e2365be
commit abd7fbf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/src/Behat/Mink/Driver/Selenium2Driver.php b/src/Behat/Mink/Driver/Selenium2Driver.php
@@ -470,7 +470,7 @@ public function getValue($xpath)
 var node = {{ELEMENT}},
     tagName = node.tagName;
 
-if (tagName == "INPUT") {
+if (tagName == "INPUT" || "TEXTAREA" == tagName) {
     var type = node.getAttribute('type');
     if (type == "checkbox") {
         value = "boolean:" + node.checked;
@@ -489,8 +489,6 @@ public function getValue($xpath)
     } else {
         value = "string:" + node.value;
     }
-} else if (tagName == "TEXTAREA") {
-  value = "string:" + node.text;
 } else if (tagName == "SELECT") {
     if (node.getAttribute('multiple')) {
         options = [];
@@ -524,7 +522,7 @@ public function getValue($xpath)
 
         $value = $this->executeJsOnXpath($xpath, $script);
         if ($value) {
-            if (preg_match('/^string:(.*)$/', $value, $vars)) {
+            if (preg_match('/^string:(.*)$/ms', $value, $vars)) {
                 return $vars[1];
             }
             if (preg_match('/^boolean:(.*)$/', $value, $vars)) {

diff --git a/tests/Behat/Mink/Driver/Selenium2DriverTest.php b/tests/Behat/Mink/Driver/Selenium2DriverTest.php
@@ -33,4 +33,12 @@ public function testOtherMouseEvents()
         $clicker->mouseOver();
         $this->assertEquals('mouse overed', $clicker->getText());
     }
+
+    public function testIssue215()
+    {
+        $session = $this->getSession();
+        $session->visit($this->pathTo('/issue215.html'));
+
+        $this->assertContains("foo\nbar", $session->getPage()->findById('textarea')->getValue());
+    }
 }
diff --git a/tests/Behat/Mink/Driver/web-fixtures/issue215.html b/tests/Behat/Mink/Driver/web-fixtures/issue215.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Index page</title>
+</head>
+<body>
+
+<form action="#">
+<textarea rows="10" cols="10" id="textarea">
+foo
+bar
+</textarea>
+</form>
+
+</body>
+</html>