From a82c49473be6fd3274d57577a53df6e352b05345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Massart?= <fred@moodle.com>
Date: Wed, 28 Sep 2016 11:13:53 +0200
Subject: [PATCH] MDL-55071 behat: Adapting form_row selector to reflect recent
 changes

Labels are no longer used for static elements. The form row selector
has been changed to include "labels" from static elements.
---
 lib/behat/classes/behat_selectors.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/behat/classes/behat_selectors.php b/lib/behat/classes/behat_selectors.php
index 5d052001394..65b41d61f98 100644
--- a/lib/behat/classes/behat_selectors.php
+++ b/lib/behat/classes/behat_selectors.php
@@ -140,7 +140,7 @@ XPATH
 .//*[contains(., %locator%) and not(.//*[contains(., %locator%)])]
 XPATH
         , 'form_row' => <<<XPATH
-.//label[contains(., %locator%)]/ancestor::*[contains(concat(' ', @class, ' '), ' fitem ')]
+.//*[self::label or self::div[contains(concat(' ', @class, ' '), ' fstaticlabel ')]][contains(., %locator%)]/ancestor::*[contains(concat(' ', @class, ' '), ' fitem ')]
 XPATH
     );