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

NoelDeMartin · Feb 12, 2013 · 5c70d65 · 5c70d65
2 parents 2b8741a + b831d47
commit 5c70d65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/testing/classes/util.php b/lib/testing/classes/util.php
@@ -123,7 +123,7 @@ public static function is_test_site() {
      *
      * @return bool
      */
-    protected static function is_test_data_updated() {
+    public static function is_test_data_updated() {
         global $CFG;
 
         $framework = self::get_framework();

diff --git a/lib/tests/behat/behat_hooks.php b/lib/tests/behat/behat_hooks.php
@@ -69,6 +69,7 @@ public static function before_suite($event) {
         define('BEHAT_RUNNING', 1);
         define('CLI_SCRIPT', 1);
 
+        // With BEHAT_RUNNING we will be using $CFG->behat_* instead of $CFG->dataroot, $CFG->prefix and $CFG->wwwroot.
         require_once(__DIR__ . '/../../../config.php');
 
         // Now that we are MOODLE_INTERNAL.
@@ -88,6 +89,11 @@ public static function before_suite($event) {
             throw new Exception($CFG->behat_wwwroot . ' is not available, ensure you started your PHP built-in server. More info in ' . behat_command::DOCS_URL . '#Running_tests');
         }
 
+        // Prevents using outdated data, upgrade script would start and tests would fail.
+        if (!behat_util::is_test_data_updated()) {
+            $commandpath = 'php admin/tool/behat/cli/util.php';
+            throw new Exception('Your behat test site is outdated, please run ' . $commandpath . ' from your moodle dirroot to drop and install the behat test site again.');
+        }
         // Avoid parallel tests execution, it continues when the previous lock is released.
         test_lock::acquire('behat');
     }