From 867ed9aa6efe2c0859c4973a95c5f1607b8f99d0 Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Thu, 13 Mar 2014 15:41:58 +0000
Subject: [PATCH] Get travis screenshots for Updater + Installation test +
check build working. [ci skip]
---
tests/PHPUnit/UI | 2 +-
tests/PHPUnit/travis.sh | 2 +-
tests/lib/screenshot-testing/support/test-environment.js | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 537bda7a28..3e65b5d4db 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 537bda7a28333597a71837092d5c421bb5770bee
+Subproject commit 3e65b5d4db595b436e43182232e5af4ef7772294
diff --git a/tests/PHPUnit/travis.sh b/tests/PHPUnit/travis.sh
index a715e96519..c4bc7db505 100755
--- a/tests/PHPUnit/travis.sh
+++ b/tests/PHPUnit/travis.sh
@@ -32,7 +32,7 @@ then
then
phantomjs ../lib/screenshot-testing/run-tests.js --assume-artifacts --persist-fixture-data --screenshot-repo=$TRAVIS_REPO_SLUG $PLUGIN_NAME
else
- phantomjs ../lib/screenshot-testing/run-tests.js --store-in-ui-tests-repo --persist-fixture-data --assume-artifacts Installation Login
+ phantomjs ../lib/screenshot-testing/run-tests.js --store-in-ui-tests-repo --persist-fixture-data --assume-artifacts Installation Updater Login
fi
else
if [ -n "$PLUGIN_NAME" ]
diff --git a/tests/lib/screenshot-testing/support/test-environment.js b/tests/lib/screenshot-testing/support/test-environment.js
index fbaa34e945..9d05448499 100644
--- a/tests/lib/screenshot-testing/support/test-environment.js
+++ b/tests/lib/screenshot-testing/support/test-environment.js
@@ -95,6 +95,8 @@ var droppedOnce = false;
TestingEnvironment.prototype.setupFixture = function (fixtureClass, done) {
console.log(" Setting up fixture " + fixtureClass + "...");
+ testEnvironment.deleteAndSave();
+
var setupFile = path.join("./support", "setupDatabase.php"),
processArgs = [setupFile, "--server=" + JSON.stringify(config.phpServer), "--fixture=" + (fixtureClass || "")];
@@ -120,6 +122,8 @@ TestingEnvironment.prototype.setupFixture = function (fixtureClass, done) {
});
child.on("exit", function (code) {
+ testEnvironment.reload();
+
if (code) {
done(new Error("Failed to setup fixture " + fixtureClass + " (error code = " + code + ")"));
} else {
--
GitLab