Skip to content

Commit 10f1683

Browse files
committed
Merge branch 'develop' of github.com:magento-pangolin/magento2-functional-testing-framework into sprint-develop
2 parents 0665f5a + 193da38 commit 10f1683

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ _generated
66
AcceptanceTester.php
77
cghooks.lock
88
src/Magento/FunctionalTestingFramework/Group/*.php
9+
.DS_Store
10+
build/*

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ env:
1010
- VERIFICATION_TOOL=static-checks
1111
script:
1212
- bin/$VERIFICATION_TOOL
13+
after_script:
14+
- if [ $VERIFICATION_TOOL == "phpunit-checks" ]; then php vendor/bin/codacycoverage phpunit; fi

bin/phpunit-checks

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See COPYING.txt for license details.
33

44
echo "===============================UNIT TESTS==============================="
5-
vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit
5+
vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit --coverage-xml build/coverage-xml
66

77
echo "===============================VERIFICATION TESTS==============================="
8-
vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite verification
8+
vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite verification --coverage-xml build/coverage-xml

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Magento2 Functional Testing Framework",
55
"keywords": ["magento", "automation", "functional", "testing"],
66
"require": {
7-
"php": "~7.0",
7+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
88
"codeception/codeception": "~2.3.4",
99
"flow/jsonpath": ">0.2",
1010
"fzaninotto/faker": "^1.6",
@@ -15,7 +15,8 @@
1515
"squizlabs/php_codesniffer": "1.5.3",
1616
"sebastian/phpcpd": "~3.0",
1717
"brainmaestro/composer-git-hooks": "^2.3",
18-
"codeception/aspect-mock": "^2.0"
18+
"codeception/aspect-mock": "^2.0",
19+
"codacy/coverage": "^1.4"
1920
},
2021
"autoload": {
2122
"psr-4": {

0 commit comments

Comments
 (0)