From 6163e343272b8a962bd73d55e8577d0185fded35 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 26 Sep 2020 11:16:35 +0200 Subject: [PATCH] Directly run API tests on travis, because they get stuck when run through composer --- .travis.yml | 1 + bin/test/run-api-tests.sh | 2 -- composer.json | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf7e8b15..f6e7091b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,6 +57,7 @@ before_script: script: - composer ci + - bin/test/run-api-tests.sh - if [[ ! -z "${DOCKERFILE_CHANGED}" && "${TRAVIS_PHP_VERSION}" == "7.4" ]]; then docker build -t shlink-docker-image:temp . ; fi after_success: diff --git a/bin/test/run-api-tests.sh b/bin/test/run-api-tests.sh index 00b97407..f3236d1b 100755 --- a/bin/test/run-api-tests.sh +++ b/bin/test/run-api-tests.sh @@ -15,7 +15,5 @@ testsExitCode=$? vendor/bin/mezzio-swoole stop -echo "The exist code was $testsExitCode" - # Exit this script with the same code as the tests. If tests failed, this script has to fail exit $testsExitCode diff --git a/composer.json b/composer.json index a2cb9539..c508b0fd 100644 --- a/composer.json +++ b/composer.json @@ -116,8 +116,7 @@ ], "test:ci": [ "@test:unit:ci", - "@test:db", - "@test:api" + "@test:db" ], "test:unit": "@php vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox", "test:unit:ci": "@test:unit --coverage-xml=build/coverage-unit/coverage-xml --log-junit=build/coverage-unit/junit.xml",