Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle

moodle · Jan 29, 2013 · e0f7550 · e0f7550
2 parents 68aaba6 + ec017a3
commit e0f7550
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/admin/tool/behat/tests/tool_behat_test.php b/admin/tool/behat/tests/tool_behat_test.php
@@ -145,6 +145,12 @@ public function test_merge_configs() {
     public function test_config_file_contents() {
         global $CFG;
 
+        // Skip tests if behat is not installed.
+        $vendorpath = $CFG->dirroot . '/vendor';
+        if (!file_exists($vendorpath . '/autoload.php') || !is_dir($vendorpath . '/behat')) {
+            $this->markTestSkipped('Behat not installed.');
+        }
+
         // To avoid user value at config.php level.
         unset($CFG->behat_config);