From b3d0a8b4a786509477f55809ba7e7364ff0bd3b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Massart?= Date: Tue, 27 Sep 2016 15:59:48 +0200 Subject: [PATCH] MDL-55071 behat: Normalise space on multi-field admin elements --- admin/templates/setting_courselist_frontpage.mustache | 2 +- admin/tests/behat/behat_admin.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/admin/templates/setting_courselist_frontpage.mustache b/admin/templates/setting_courselist_frontpage.mustache index 1cde3aa075e..2fe18cc1028 100644 --- a/admin/templates/setting_courselist_frontpage.mustache +++ b/admin/templates/setting_courselist_frontpage.mustache @@ -39,7 +39,7 @@ }}
{{#selects}} - {{#options}} {{/options}} diff --git a/admin/tests/behat/behat_admin.php b/admin/tests/behat/behat_admin.php index 3f5cb46997e..73ce5728e20 100644 --- a/admin/tests/behat/behat_admin.php +++ b/admin/tests/behat/behat_admin.php @@ -89,8 +89,10 @@ class behat_admin extends behat_base { } catch (ElementNotFoundException $e) { // Multi element settings, interacting only the first one. - $fieldxpath = "//*[label[.= $label]|span[.= $label]]/ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-item ')]" . - "/descendant::div[@class='form-group']/descendant::*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]"; + $fieldxpath = "//*[label[normalize-space(.)= $label]|span[normalize-space(.)= $label]]/" . + "ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-item ')]" . + "/descendant::div[@class='form-group']/descendant::*[self::input | self::textarea | self::select]" . + "[not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]"; $fieldnode = $this->find('xpath', $fieldxpath); // It is the same one that contains the type. -- 2.43.0