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

Conflicts: config-dist.php
Andmat7 · Dec 9, 2013 · e3f7ac0 · e3f7ac0
2 parents d073a5f + ddb0a1b
commit e3f7ac0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/config-dist.php b/config-dist.php
@@ -672,6 +672,11 @@
 // 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
 //=========================================================================

diff --git a/lib/behat/classes/behat_config_manager.php b/lib/behat/classes/behat_config_manager.php
@@ -82,6 +82,11 @@ public static function update_config_file($component = '', $testsrunner = true)
             $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();