ability to choose select option by text (closes minkphp#75)

Behat · Sep 29, 2011 · 173c49d · 173c49d
1 parent b36ef63
commit 173c49d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/Behat/Mink/Element/NodeElement.php b/src/Behat/Mink/Element/NodeElement.php
@@ -4,7 +4,8 @@
 
 use Behat\Mink\Session,
     Behat\Mink\Driver\DriverInterface,
-    Behat\Mink\Element\ElementInterface;
+    Behat\Mink\Element\ElementInterface,
+    Behat\Mink\Exception\ElementNotFoundException;
 
 /*
  * This file is part of the Behat\Mink.
@@ -161,7 +162,21 @@ public function isChecked()
      */
     public function selectOption($option)
     {
-        $this->getSession()->getDriver()->selectOption($this->getXpath(), $option);
+        if ('select' !== $this->getTagName()) {
+            $this->getSession()->getDriver()->selectOption($this->getXpath(), $option);
+
+            return;
+        }
+
+        $opt = $this->find('named', array('option', $option));
+
+        if (null === $opt) {
+            throw new ElementNotFoundException(
+                $this->getSession(), 'select option', 'value|text', $option
+            );
+        }
+
+        $this->getSession()->getDriver()->selectOption($this->getXpath(), $opt->getValue());
     }
 
     /**

diff --git a/tests/Behat/Mink/Driver/GeneralDriverTest.php b/tests/Behat/Mink/Driver/GeneralDriverTest.php
@@ -313,7 +313,7 @@ public function testAdvancedForm()
         $maillist->uncheck();
         $this->assertFalse($maillist->isChecked());
 
-        $select->selectOption('10');
+        $select->selectOption('ten');
         $this->assertEquals('10', $select->getValue());
 
         $sex->selectOption('m');