From 0eb9d127e6ccba448f667be702d27f180ca39c53 Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Thu, 13 Mar 2014 18:08:37 +0000
Subject: [PATCH] Re-enable full UI tests build & fix random composer travis
failure.
---
.travis.yml | 1 +
tests/PHPUnit/UI | 2 +-
tests/PHPUnit/travis.sh | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 139184f409..22ce91aceb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,7 @@ matrix:
script: ./travis.sh
before_script:
+ - composer self-update
- composer install
- uname -a
- date
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index c6055a3440..7592f54dde 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit c6055a34407c3ec3fe01d6d846452a693952bc69
+Subproject commit 7592f54dde0efa700ab7935ef15b5414a8e640a2
diff --git a/tests/PHPUnit/travis.sh b/tests/PHPUnit/travis.sh
index c4bc7db505..c9f4892459 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 Updater Login
+ phantomjs ../lib/screenshot-testing/run-tests.js --store-in-ui-tests-repo --persist-fixture-data --assume-artifacts
fi
else
if [ -n "$PLUGIN_NAME" ]
--
GitLab