mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle

Browse Source 
Conflicts:
	config-dist.php
This commit is contained in:
Sam Hemelryk 2013-12-10 08:36:39 +13:00
commit e3f7ac09e7
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config-dist.php
View File

@ -672,6 +672,11 @@ $CFG->admin = 'admin';
// Example:
// $CFG->behat_usedeprecated = true;
//
// Including feature files from directories outside the dirroot is possible if required. The setting
// requires that the running user has executable permissions on all parent directories in the paths.
// Example:
// $CFG->behat_additionalfeatures = array('/home/developer/code/wipfeatures');
//
//=========================================================================
// 12. DEVELOPER DATA GENERATOR
//=========================================================================

5
lib/behat/classes/behat_config_manager.php
View File

@ -82,6 +82,11 @@ class behat_config_manager {
$features = array_values($featurespaths);
}
// Optionally include features from additional directories.
if (!empty($CFG->behat_additionalfeatures)) {
$features = array_merge($features, array_map("realpath", $CFG->behat_additionalfeatures));
}
// Gets all the components with steps definitions.
$stepsdefinitions = array();
$steps = self::get_components_steps_definitions();