Fixing bugs in screenshot testing lib.

UI @ e9593ef8

-Subproject commit a58fcba24ef69c6a5c48bcfcb2fd5afd2c7d3c78
+Subproject commit e9593ef8b7bb9c91a86b31fb2a08f917837fe57d

tests/lib/screenshot-testing/support/app.js

@@ -115,11 +115,6 @@ Application.prototype.loadTestModules = function () {
         suite._beforeAll.unshift(suite._beforeAll.pop());
 
         suite.afterAll(function (done) {
-            if (!fixture) {
-                done();
-                return;
-            }
-
             testEnvironment.teardownFixture(fixture, done);
         });
     });

tests/lib/screenshot-testing/support/test-environment.js

@@ -15,6 +15,10 @@ var TestingEnvironment = function () {
 };
 
 TestingEnvironment.prototype.reload = function () {
+    for (var key in this) {
+        delete this[key];
+    }
+
     if (fs.exists(testingEnvironmentOverridePath)) {
         var data = JSON.parse(fs.read(testingEnvironmentOverridePath));
         for (var key in data) {
@@ -29,8 +33,6 @@ TestingEnvironment.prototype.save = function () {
         copy[key] = this[key];
     }
 
-    delete copy.backup;
-
     fs.write(testingEnvironmentOverridePath, JSON.stringify(copy));
 };
 
@@ -90,8 +92,6 @@ TestingEnvironment.prototype._call = function (params, done) {
 };
 
 TestingEnvironment.prototype.setupFixture = function (fixtureClass, done) {
-    this.backup = JSON.stringify(this);
-
     console.log("    Setting up fixture " + fixtureClass + "...");
 
     var setupFile = path.join("./support", "setupDatabase.php"),
@@ -125,7 +125,11 @@ TestingEnvironment.prototype.setupFixture = function (fixtureClass, done) {
 };
 
 TestingEnvironment.prototype.teardownFixture = function (fixtureClass, done) {
-    if (options['persist-fixture-data']) {
+    if (options['persist-fixture-data']
+        || !fixtureClass
+    ) {
+        this.deleteAndSave();
+
         done();
         return;
     }
@@ -146,11 +150,7 @@ TestingEnvironment.prototype.teardownFixture = function (fixtureClass, done) {
 
     var self = this;
     child.on("exit", function (code) {
-        for (var key in self.backup) {
-            self[key] = self.backup[key];
-        }
-
-        self.backup = {};
+        self.deleteAndSave();
 
         if (code) {
             done(new Error("Failed to teardown fixture " + fixtureClass + " (error code = " + code + ")"));
@@ -160,4 +160,9 @@ TestingEnvironment.prototype.teardownFixture = function (fixtureClass, done) {
     });
 };
 
+TestingEnvironment.prototype.deleteAndSave = function () {
+    fs.write(testingEnvironmentOverridePath, "{}");
+    this.reload();
+};
+
 exports.TestingEnvironment = new TestingEnvironment();
\ No newline at end of file