From 31c8fd3e838e7a88f919a7abd9ebbad8c835a117 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Tue, 30 Aug 2016 09:24:33 +0800
Subject: [PATCH] MDL-55766 behat: set core behat selectors if not overridden
by theme
---
lib/tests/behat/behat_hooks.php | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/tests/behat/behat_hooks.php b/lib/tests/behat/behat_hooks.php
index 017e34238a1..5398e0a0aad 100644
--- a/lib/tests/behat/behat_hooks.php
+++ b/lib/tests/behat/behat_hooks.php
@@ -311,12 +311,16 @@ class behat_hooks extends behat_base {
// We need the Mink session to do it and we do it only before the first scenario.
$behatselectorclass = 'behat_selectors';
if ($suitename !== 'default') {
- $behatselectorclass = behat_config_util::get_behat_theme_selector_override_classname($suitename, true);
- }
- if (class_exists($behatselectorclass)) {
- $behatselectorclass = new $behatselectorclass();
- $behatselectorclass::register_moodle_selectors($session);
+ $overriddenselectorclass = behat_config_util::get_behat_theme_selector_override_classname($suitename, true);
+
+ // If override slector exist, then set it as default behat selectors class.
+ if (class_exists($overriddenselectorclass)) {
+ $behatselectorclass = $overriddenselectorclass;
+ }
}
+
+ $behatselectorclass = new $behatselectorclass();
+ $behatselectorclass::register_moodle_selectors($session);
}
// Reset mink session between the scenarios.