From 6d46ef548e27bda21006e4bd024ef697549e5965 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 16 Apr 2020 16:26:29 -0600
Subject: [PATCH] Enable tests again to catch failures

---
 package.json                   |  3 +--
 scripts/ci/end-to-end-tests.sh | 47 +++++++++++++++-------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 4204b87b5a..7ba69c4272 100644
--- a/package.json
+++ b/package.json
@@ -51,8 +51,7 @@
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest",
-    "test:e2e": "echo 'The tests are broken with cross-signing. Fix them: https://github.com/vector-im/riot-web/issues/13226'",
-    "test:e2e_real": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
+    "test:e2e": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
   },
   "dependencies": {
     "@babel/runtime": "^7.8.3",
diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh
index fa1f2b983f..1233677db4 100755
--- a/scripts/ci/end-to-end-tests.sh
+++ b/scripts/ci/end-to-end-tests.sh
@@ -13,29 +13,24 @@ handle_error() {
 
 trap 'handle_error' ERR
 
-echo "Tests are disabled, see https://github.com/vector-im/riot-web/issues/13226"
-exit 0
-
-#TODO: Uncomment all of this in https://github.com/vector-im/riot-web/issues/13226
-
-#echo "--- Building Riot"
-#scripts/ci/layered-riot-web.sh
-#cd ../riot-web
-#riot_web_dir=`pwd`
-#CI_PACKAGE=true yarn build
-#cd ../matrix-react-sdk
-## run end to end tests
-#pushd test/end-to-end-tests
-#ln -s $riot_web_dir riot/riot-web
-## PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
-## CHROME_PATH=$(which google-chrome-stable) ./run.sh
-#echo "--- Install synapse & other dependencies"
-#./install.sh
-## install static webserver to server symlinked local copy of riot
-#./riot/install-webserver.sh
-#rm -r logs || true
-#mkdir logs
-#echo "+++ Running end-to-end tests"
-#TESTS_STARTED=1
-#./run.sh --no-sandbox --log-directory logs/
-#popd
+echo "--- Building Riot"
+scripts/ci/layered-riot-web.sh
+cd ../riot-web
+riot_web_dir=`pwd`
+CI_PACKAGE=true yarn build
+cd ../matrix-react-sdk
+# run end to end tests
+pushd test/end-to-end-tests
+ln -s $riot_web_dir riot/riot-web
+# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
+# CHROME_PATH=$(which google-chrome-stable) ./run.sh
+echo "--- Install synapse & other dependencies"
+./install.sh
+# install static webserver to server symlinked local copy of riot
+./riot/install-webserver.sh
+rm -r logs || true
+mkdir logs
+echo "+++ Running end-to-end tests"
+TESTS_STARTED=1
+./run.sh --no-sandbox --log-directory logs/
+popd