diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml index feb9e100f..6d3a7a49f 100644 --- a/.github/workflows/TestPHPUnit.yml +++ b/.github/workflows/TestPHPUnit.yml @@ -75,9 +75,9 @@ jobs: path: test_result - name: Confirm All PHPUnit Functional Tests were run - uses: GuillaumeFalourd/assert-command-line-output@v2 + uses: GuillaumeFalourd/assert-command-line-output@v2.2 with: - command_line: xmllint --xpath 'string(//testsuites/testsuite/@tests)' test_result/phpunit.xml + command_line: xmllint --xpath 'string(//testsuites/testsuite/@tests)' test_result/phpunit-functional.xml contains: 18 expected_result: PASSED @@ -146,7 +146,7 @@ jobs: - name: Confirm All PHPUnit Functional Tests were run uses: GuillaumeFalourd/assert-command-line-output@v2 with: - command_line: xmllint --xpath 'string(//testsuites/testsuite/@tests)' test_result/phpunit.xml + command_line: xmllint --xpath 'string(//testsuites/testsuite/@tests)' test_result/phpunit-functional.xml contains: 21 expected_result: PASSED diff --git a/drainpipe-dev/composer.json b/drainpipe-dev/composer.json index ff9908162..b287575e9 100644 --- a/drainpipe-dev/composer.json +++ b/drainpipe-dev/composer.json @@ -16,7 +16,7 @@ "phpunit/phpunit": "^8|^9", "sserbin/twig-linter": "^3.1.0", "mikey179/vfsstream": "^1.6.11", - "mockery/mockery": "^1.6.6", + "mockery/mockery": "^1.6.7", "behat/mink": "^1.10.0", "symfony/phpunit-bridge": "^5.3|^6.3", "lullabot/drainpipe": "*", diff --git a/tasks/test.yml b/tasks/test.yml index e60d86c77..7f8ad89ca 100644 --- a/tasks/test.yml +++ b/tasks/test.yml @@ -109,13 +109,13 @@ tasks: desc: Runs PHPUnit unit tests cmds: - | - CONFIG="vendor/lullabot/drainpipe/scaffold/phpunit.xml" + CONFIG="$(pwd)/vendor/lullabot/drainpipe/scaffold/phpunit.xml" if [ "{{.DRUPAL_TEST_TRAITS}}" == "true" ]; then - CONFIG="vendor/lullabot/drainpipe/scaffold/phpunit-testtraits.xml" + CONFIG="$(pwd)/vendor/lullabot/drainpipe/scaffold/phpunit-testtraits.xml" fi if [ "{{.format}}" == "junit" ]; then mkdir -p test_result - ./vendor/bin/phpunit --testsuite=unit -c $CONFIG --log-junit test_result/phpunit.xml + ./vendor/bin/phpunit --testsuite=unit -c $CONFIG --log-junit $(pwd)/test_result/phpunit.xml else ./vendor/bin/phpunit -c $CONFIG --testsuite=unit fi @@ -129,7 +129,7 @@ tasks: fi if [ "{{.format}}" == "junit" ]; then mkdir -p test_result - ./vendor/bin/phpunit --exclude-group=unit -c $CONFIG --log-junit test_result/phpunit.xml + ./vendor/bin/phpunit --exclude-group=unit -c $CONFIG --log-junit $(pwd)/test_result/phpunit-functional.xml else ./vendor/bin/phpunit -c $CONFIG --exclude-group=unit fi