Update dependency mockery/mockery to ^1.6.7 (#355)

* Update dependency mockery/mockery to ^1.6.7 * Update GuillaumeFalourd/assert-command-line-output action * Set absolute paths in PHPUnit configuration * Fix test paths --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Sally Young <[email protected]>
Lullabot · Jan 29, 2024 · 9507447 · 9507447
1 parent c1fe803
commit 9507447
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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