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

…ODLE_28_STABLE
moodle · Dec 9, 2014 · 41ea5af · 41ea5af
2 parents f071a17 + 13dfdb0
commit 41ea5af
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/behat/classes/util.php b/lib/behat/classes/util.php
@@ -294,6 +294,12 @@ protected final static function get_test_file_path() {
      * 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 @@ public static function reset_all_data() {
 
         // Inform data generator.
         self::get_data_generator()->reset();
-
-        // Purge dataroot directory.
-        self::reset_dataroot();
-
-        // Reset database.
-        self::reset_database();
     }
 }