MDL-37046 behat: Split in different classes

moodle · Jan 29, 2013 · b5c1300 · b5c1300
1 parent 9516712
commit b5c1300
Show file tree

Hide file tree

Showing 8 changed files with 620 additions and 494 deletions.
diff --git a/admin/tool/behat/cli/util.php b/admin/tool/behat/cli/util.php
@@ -26,7 +26,7 @@
 
 require(__DIR__ . '/../../../../config.php');
 require_once($CFG->libdir . '/clilib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/tool/behat/locallib.php');
+require_once($CFG->libdir . '/behat/behat_util.php');
 
 // CLI options.
 list($options, $unrecognized) = cli_get_params(
@@ -75,7 +75,7 @@
     exit(0);
 }
 
-tool_behat::switchenvironment($action);
+behat_util::switchenvironment($action);
 
 mtrace(get_string('testenvironment' . $action, 'tool_behat'));
 
diff --git a/admin/tool/behat/index.php b/admin/tool/behat/index.php
@@ -25,6 +25,7 @@
 require(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin . '/tool/behat/locallib.php');
+require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
 
 $filter = optional_param('filter', '', PARAM_ALPHANUMEXT);
 $type = optional_param('type', false, PARAM_ALPHAEXT);
@@ -39,7 +40,7 @@
 $componentswithsteps = array('' => get_string('allavailablesteps', 'tool_behat'));
 
 // Complete the components list with the moodle steps definitions.
-$components = tool_behat::get_components_steps_definitions();
+$components = behat_config_manager::get_components_steps_definitions();
 if ($components) {
     foreach ($components as $component => $filepath) {
         // TODO Use a class static attribute instead of the class name.