InnerBrowser: selectOption can match by text when option has no value attribute #5547

Naktibalda · Naktibalda · commit 3e9e7cb4f595 · 2019-06-16T19:46:45.000+03:00
diff --git a/src/Codeception/Lib/InnerBrowser.php b/src/Codeception/Lib/InnerBrowser.php
@@ -1122,13 +1122,16 @@ protected function matchOption(Crawler $field, $option)
         }
         $options = $field->filterXPath(sprintf('//option[text()=normalize-space("%s")]|//input[@type="radio" and @value=normalize-space("%s")]', $option, $option));
         if ($options->count()) {
-            if ($options->getNode(0)->tagName === 'option') {
-                $options->getNode(0)->setAttribute('selected', 'selected');
+            $firstMatchingDomNode = $options->getNode(0);
+            if ($firstMatchingDomNode->tagName === 'option') {
+                $firstMatchingDomNode->setAttribute('selected', 'selected');
             } else {
-                $options->getNode(0)->setAttribute('checked', 'checked');
+                $firstMatchingDomNode->setAttribute('checked', 'checked');
             }
-            if ($options->first()->attr('value') !== false) {
-                return $options->first()->attr('value');
+            $valueAttribute = $options->first()->attr('value');
+            //attr() returns null when option has no value attribute
+            if ($valueAttribute !== null) {
+                return $valueAttribute;
             }
             return $options->first()->text();
         }
diff --git a/tests/data/app/view/form/bug5547.php b/tests/data/app/view/form/bug5547.php
@@ -0,0 +1,12 @@
+<html>
+<body>
+<form action="/form/complex" method="POST">
+    <select id="_payment_type" name="payment_type" required="" class="form-control">
+        <option>За показы</option>
+        <option>За размещение</option>
+        <option>qwerty</option>
+    </select>
+    <input type="submit" value="Submit" />
+</form>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -1122,13 +1122,16 @@ protected function matchOption(Crawler $field, $option)`
`1122`	`1122`	`}`
`1123`	`1123`	`$options = $field->filterXPath(sprintf('//option[text()=normalize-space("%s")]\|//input[@type="radio" and @value=normalize-space("%s")]', $option, $option));`
`1124`	`1124`	`if ($options->count()) {`
`1125`		`- if ($options->getNode(0)->tagName === 'option') {`
`1126`		`- $options->getNode(0)->setAttribute('selected', 'selected');`
	`1125`	`+ $firstMatchingDomNode = $options->getNode(0);`
	`1126`	`+ if ($firstMatchingDomNode->tagName === 'option') {`
	`1127`	`+ $firstMatchingDomNode->setAttribute('selected', 'selected');`
`1127`	`1128`	`} else {`
`1128`		`- $options->getNode(0)->setAttribute('checked', 'checked');`
	`1129`	`+ $firstMatchingDomNode->setAttribute('checked', 'checked');`
`1129`	`1130`	`}`
`1130`		`- if ($options->first()->attr('value') !== false) {`
`1131`		`- return $options->first()->attr('value');`
	`1131`	`+ $valueAttribute = $options->first()->attr('value');`
	`1132`	`+ //attr() returns null when option has no value attribute`
	`1133`	`+ if ($valueAttribute !== null) {`
	`1134`	`+ return $valueAttribute;`
`1132`	`1135`	`}`
`1133`	`1136`	`return $options->first()->text();`
`1134`	`1137`	`}`