moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-63977 Behat: Rename Ionic config variables for consistency

Browse source
This commit is contained in:
sam marshall 2019-02-11 16:40:56 +00:00
parent 079eae376c
commit ff3ccab52e
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/behat/classes/behat_command.php
View file

@ -220,7 +220,7 @@ class behat_command {
}
// If app config is supplied, check the value is correct.
if (!empty($CFG->behat_approot) && !file_exists($CFG->behat_approot . '/ionic.config.json')) {
if (!empty($CFG->behat_ionic_dirroot) && !file_exists($CFG->behat_ionic_dirroot . '/ionic.config.json')) {
self::output_msg(get_string('errorapproot', 'tool_behat'));
return BEHAT_EXITCODE_CONFIG;
}

6
lib/behat/classes/behat_config_util.php
View file

@ -705,12 +705,12 @@ class behat_config_util {
protected function get_mobile_version_tags() : string {
global $CFG;
if (empty($CFG->behat_approot)) {
if (empty($CFG->behat_ionic_dirroot)) {
return '';
}
// Get app version.
$jsonpath = $CFG->behat_approot . '/package.json';
$jsonpath = $CFG->behat_ionic_dirroot . '/package.json';
$json = @file_get_contents($jsonpath);
if (!$json) {
throw new coding_exception('Unable to load app version from ' . $jsonpath);
@ -1360,7 +1360,7 @@ class behat_config_util {
// Mobile app tests are not theme-specific, so run only for the default theme (and if
// configured).
if (empty($CFG->behat_approot) || $theme !== $this->get_default_theme()) {
if (empty($CFG->behat_ionic_dirroot) || $theme !== $this->get_default_theme()) {
$themeblacklisttags[] = '@app';
}