Merge branch 'mdl48517_28' of https://github.com/tlevi/moodle into MOODLE_28_STABLE

2014-12-09 15:16:00 +13:00
parent f071a177b0 13dfdb0b5f
commit 41ea5affc4
1 changed files with 6 additions and 6 deletions
@@ -294,6 +294,12 @@ class behat_util extends testing_util {
     * Reset contents of all database tables to initial values, reset caches, etc.
     */
    public static function reset_all_data() {
+        // Reset database.
+        self::reset_database();
+
+        // Purge dataroot directory.
+        self::reset_dataroot();
+
        // Reset all static caches.
        accesslib_clear_all_caches(true);
        // Reset the nasty strings list used during the last test.
@@ -310,11 +316,5 @@ class behat_util extends testing_util {

        // Inform data generator.
        self::get_data_generator()->reset();
-
-        // Purge dataroot directory.
-        self::reset_dataroot();
-
-        // Reset database.
-        self::reset_database();
    }
 }