Enable tests again to catch failures

pull/21833/head
Travis Ralston 2020-04-16 16:26:29 -06:00
parent 3d99125ced
commit 6d46ef548e
2 changed files with 22 additions and 28 deletions

View File

@ -51,8 +51,7 @@
"lint:types": "tsc --noEmit --jsx react", "lint:types": "tsc --noEmit --jsx react",
"lint:style": "stylelint 'res/css/**/*.scss'", "lint:style": "stylelint 'res/css/**/*.scss'",
"test": "jest", "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": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
"test:e2e_real": "./test/end-to-end-tests/run.sh --riot-url http://localhost:8080"
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.8.3", "@babel/runtime": "^7.8.3",

View File

@ -13,29 +13,24 @@ handle_error() {
trap 'handle_error' ERR trap 'handle_error' ERR
echo "Tests are disabled, see https://github.com/vector-im/riot-web/issues/13226" echo "--- Building Riot"
exit 0 scripts/ci/layered-riot-web.sh
cd ../riot-web
#TODO: Uncomment all of this in https://github.com/vector-im/riot-web/issues/13226 riot_web_dir=`pwd`
CI_PACKAGE=true yarn build
#echo "--- Building Riot" cd ../matrix-react-sdk
#scripts/ci/layered-riot-web.sh # run end to end tests
#cd ../riot-web pushd test/end-to-end-tests
#riot_web_dir=`pwd` ln -s $riot_web_dir riot/riot-web
#CI_PACKAGE=true yarn build # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
#cd ../matrix-react-sdk # CHROME_PATH=$(which google-chrome-stable) ./run.sh
## run end to end tests echo "--- Install synapse & other dependencies"
#pushd test/end-to-end-tests ./install.sh
#ln -s $riot_web_dir riot/riot-web # install static webserver to server symlinked local copy of riot
## PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh ./riot/install-webserver.sh
## CHROME_PATH=$(which google-chrome-stable) ./run.sh rm -r logs || true
#echo "--- Install synapse & other dependencies" mkdir logs
#./install.sh echo "+++ Running end-to-end tests"
## install static webserver to server symlinked local copy of riot TESTS_STARTED=1
#./riot/install-webserver.sh ./run.sh --no-sandbox --log-directory logs/
#rm -r logs || true popd
#mkdir logs
#echo "+++ Running end-to-end tests"
#TESTS_STARTED=1
#./run.sh --no-sandbox --log-directory logs/
#popd