From 043da289102647a9e44c01ffdd5f512545ea9e08 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 21 Aug 2019 13:34:28 +0800 Subject: [PATCH] MDL-66457 behat: simplify selector search --- lib/behat/behat_base.php | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/lib/behat/behat_base.php b/lib/behat/behat_base.php index 74800e75fe6..7313cbfaf51 100644 --- a/lib/behat/behat_base.php +++ b/lib/behat/behat_base.php @@ -185,27 +185,7 @@ class behat_base extends Behat\MinkExtension\Context\RawMinkContext { return $context->getSession()->getPage()->findAll($args['selector'], $args['locator']); } - // For nodes contained in other nodes we can not use the basic named selectors - // as they include unions and they would look for matches in the DOM root. - $elementxpath = $context->getSession()->getSelectorsHandler()->selectorToXpath($args['selector'], $args['locator']); - - // Split the xpath in unions and prefix them with the container xpath. - $unions = explode('|', $elementxpath); - foreach ($unions as $key => $union) { - $union = trim($union); - - // We are in the container node. - if (strpos($union, '.') === 0) { - $union = substr($union, 1); - } else if (strpos($union, '/') !== 0) { - // Adding the path separator in case it is not there. - $union = '/' . $union; - } - $unions[$key] = $args['node']->getXpath() . $union; - } - - // We can not use usual Element::find() as it prefixes with DOM root. - return $context->getSession()->getDriver()->find(implode('|', $unions)); + return $args['node']->findAll($args['selector'], $args['locator']); }, $params, $timeout,