mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-19 07:25:30 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-67965-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2020-02-14 13:25:16 +08:00 committed by Eloy Lafuente (stronk7)
commit ed683f5f24
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/behat/classes/behat_context_helper.php
View File

@ -90,31 +90,54 @@ class behat_context_helper {
* @return behat_base
*/
public static function get($classname) {
if (self::$environment->hasContextClass($classname)) {
return self::$environment->getContext($classname);
$definedclassname = self::get_theme_override($classname);
if ($definedclassname) {
return self::$environment->getContext($definedclassname);
}
// Just fall back on getContext to ensure that we throw the correct exception.
return self::$environment->getContext($classname);
}
/**
* Get the context for the specified component or subsystem.
*
* @param string $component The component or subsystem to find the context for
* @return behat_base|null
*/
public static function get_component_context(string $component): ?behat_base {
$component = str_replace('core_', '', $component);
if ($classname = self::get_theme_override("behat_{$component}")) {
return self::get($classname);
}
return null;
}
/**
* Check for any theme override of the specified class name.
*
* @param string $classname
* @return string|null
*/
protected static function get_theme_override(string $classname): ?string {
$suitename = self::$environment->getSuite()->getName();
// If default suite, then get the default theme name.
if ($suitename == 'default') {
$suitename = theme_config::DEFAULT_THEME;
}
$overridencontextname = 'behat_theme_'.$suitename.'_'.$classname;
// If contexts has not been checked before and doesn't exist then just use core one.
if (!isset(self::$nonexistingcontexts[$overridencontextname])) {
try {
$subcontext = self::$environment->getContext($overridencontextname);
return $subcontext;
} catch (Behat\Behat\Context\Exception\ContextNotFoundException $e) {
// If context not found then it's not overridden.
self::$nonexistingcontexts[$overridencontextname] = 1;
}
$overrideclassname = "behat_theme_{$suitename}_{$classname}";
if (self::$environment->hasContextClass($overrideclassname)) {
return $overrideclassname;
}
// Get the actual context.
return self::$environment->getContext($classname);
if (self::$environment->hasContextClass($classname)) {
return $classname;
}
return null;
}
/**

14
lib/tests/behat/behat_hooks.php
View File

@ -721,20 +721,12 @@ class behat_hooks extends behat_base {
* @param string $component
*/
public function register_component_selectors_for_component(string $component): void {
$componentclassname = "behat_{$component}";
$context = behat_context_helper::get_component_context($component);
if (!behat_context_helper::has_context($componentclassname)) {
if ("core_" === substr($component, 0, 5)) {
$componentclassname = "behat_" . substr($component, 5);
if (!behat_context_helper::has_context($componentclassname)) {
return;
}
} else {
return;
}
if ($context === null) {
return;
}
$context = behat_context_helper::get($componentclassname);
$namedpartial = $this->getSession()->getSelectorsHandler()->getSelector('named_partial');
$namedexact = $this->getSession()->getSelectorsHandler()->getSelector('named_exact');