MDL-37046 behat: Using moodle composer

2013-01-29 08:40:37 +08:00
parent d46340eb16
commit cb18fd7100
6 changed files with 119 additions and 20 deletions
@@ -96,7 +96,7 @@ if (!isset($CFG->test_wwwroot)) {
 }

 // Switch to test site only when test environment is enabled.
-if ((php_sapi_name() === 'cli-server' || defined('BEHAT_RUNNING')) && 
+if ((php_sapi_name() === 'cli-server' || defined('BEHAT_RUNNING')) &&
        file_exists($CFG->dataroot . '/behat/test_environment_enabled.txt')) {
    $CFG->wwwroot = $CFG->test_wwwroot;
    $CFG->passwordsaltmain = 'phpunit';