From f467bed24c0493c021f412db1b8857f0bf0d7eb9 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 27 Jan 2019 10:15:48 +0100 Subject: [PATCH] Used multiple commands with && instead of composer array for API tests command --- composer.json | 6 +----- config/test/test_config.global.php | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 250987b5..fe118ee4 100644 --- a/composer.json +++ b/composer.json @@ -114,11 +114,7 @@ "test:unit": "phpdbg -qrr vendor/bin/phpunit --order-by=random --coverage-php build/coverage-unit.cov", "test:unit:ci": "phpdbg -qrr vendor/bin/phpunit --order-by=random --coverage-php build/coverage-unit.cov --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/phpunit.junit.xml", "test:db": "APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random -c phpunit-db.xml --coverage-php build/coverage-db.cov", - "test:api": [ - "APP_ENV=test vendor/bin/zend-expressive-swoole start -d", - "APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random -c phpunit-api.xml", - "APP_ENV=test vendor/bin/zend-expressive-swoole stop" - ], + "test:api": "APP_ENV=test vendor/bin/zend-expressive-swoole start -d && echo 'Waiting 2 seconds for server to start...' && sleep 2 && APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random -c phpunit-api.xml && APP_ENV=test vendor/bin/zend-expressive-swoole stop", "test:pretty": [ "@test", diff --git a/config/test/test_config.global.php b/config/test/test_config.global.php index 6d359c19..79f36791 100644 --- a/config/test/test_config.global.php +++ b/config/test/test_config.global.php @@ -19,6 +19,9 @@ return [ 'port' => 9999, 'host' => '127.0.0.1', 'process-name' => 'shlink_test', + 'options' => [ + 'pid_file' => sys_get_temp_dir() . '/shlink-test-swoole.pid', + ], ], ],