Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency mockery/mockery to ^1.6.7 #355

Merged
merged 4 commits into from
Jan 29, 2024
Merged

Update dependency mockery/mockery to ^1.6.7 #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c3396d
Update dependency mockery/mockery to ^1.6.7
renovate[bot] Jan 18, 2024
21195bc
Update GuillaumeFalourd/assert-command-line-output action
justafish Jan 23, 2024
c389805
Set absolute paths in PHPUnit configuration
justafish Jan 29, 2024
746dc05
Fix test paths
justafish Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/TestPHPUnit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion drainpipe-dev/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
8 changes: 4 additions & 4 deletions tasks/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading