NamedSelector wasn’t matching buttons by name attribute in link_or_button selector

Author: Alexander Obuhovich

src/Behat/Mink/Selector/NamedSelector.php

@@ -93,16 +93,19 @@ class NamedSelector implements SelectorInterface
 [./@href][(%linkMatch% or %imgAltMatch%)]
 |
 .//input
-[%buttonTypeFilter%][(%idOrValueMatch% or %titleMatch%)]
+[%buttonTypeFilter%][(%buttonMatch%)]
 |
 .//input
 [%lowercaseType% = 'image'][%altMatch%]
 |
 .//button
-[(%idOrValueMatch% or %titleMatch% or %tagTextMatch%)]
+[(%buttonMatch% or %tagTextMatch%)]
+|
+.//*
+[%lowercaseRole% = 'link'][(%idOrValueMatch% or %titleMatch% or %tagTextMatch%)]
 |
 .//*
-[(%lowercaseRole% = 'button' or %lowercaseRole% = 'link')][(%idOrValueMatch% or %titleMatch% or %tagTextMatch%)]
+[%lowercaseRole% = 'button'][(%buttonMatch% or %tagTextMatch%)]
 XPATH
 
         ,'content' => <<<XPATH

tests/Selector/NamedSelectorTest.php

@@ -95,9 +95,7 @@ public function getSelectorTests()
             'link_or_button (with-href)' => array('test.html', 'link_or_button', 'link-text', 5, 9),
             'link_or_button (without-href) ignored' => array('test.html', 'link_or_button', 'bad-link-text', 0),
             'link_or_button* (role=link)' => array('test.html', 'link_or_button', 'link-role-text', 4, 7),
-
-            // bug in selector: 17 instead of 25 and 34 instead of 42, because 8 buttons with `name` attribute were not matched
-            'link_or_button (input, name/value/title)' => array('test.html', 'link_or_button', 'button-text', 17, 34),
+            'link_or_button (input, name/value/title)' => array('test.html', 'link_or_button', 'button-text', 25, 42),
             'link_or_button (type=image, with-alt)' => array('test.html', 'link_or_button', 'button-alt-text', 1, 2),
             'link_or_button (input type=submit, with-id)' => array('test.html', 'link_or_button', 'input-submit-button', 1),
             'link_or_button (input type=image, with-id)' => array('test.html', 'link_or_button', 'input-image-button', 1),
@@ -107,9 +105,7 @@ public function getSelectorTests()
             'link_or_button (button type=image, with-id)' => array('test.html', 'link_or_button', 'button-image-button', 1),
             'link_or_button (button type=button, with-id)' => array('test.html', 'link_or_button', 'button-button-button', 1),
             'link_or_button (button type=reset, with-id)' => array('test.html', 'link_or_button', 'button-reset-button', 1),
-
-            // bug in selector: 8 instead of 12 and 16 instead of 20, because 4 buttons with `name` attribute were not matched
-            'link_or_button* (role=button, name/value/title)' => array('test.html', 'link_or_button', 'button-role-text', 8, 16),
+            'link_or_button* (role=button, name/value/title)' => array('test.html', 'link_or_button', 'button-role-text', 12, 20),
             'link_or_button* (role=button type=submit, with-id)' => array('test.html', 'link_or_button', 'role-button-submit-button', 1),
             'link_or_button* (role=button type=image, with-id)' => array('test.html', 'link_or_button', 'role-button-image-button', 1),
             'link_or_button* (role=button type=button, with-id)' => array('test.html', 'link_or_button', 'role-button-button-button', 1),