Merge pull request #234 from creative-commoners/pulls/5.0/update-phpunit
Use PHPUnit 7.1.3, update PHPUnit config file schema, quote testsuites in Travis config
This commit is contained in:
commit
b6835a8d15
|
@ -15,7 +15,7 @@ trim_trailing_whitespace = true
|
|||
[*.md]
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
[*.yml]
|
||||
[*.{yml,xml,xml.dist}]
|
||||
indent_size = 2
|
||||
indent_style = space
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ matrix:
|
|||
env:
|
||||
- BEHAT_TEST="@asset-admin"
|
||||
- DB=MYSQL
|
||||
- php: 5.6
|
||||
- php: 7.2
|
||||
env:
|
||||
- HEALTH_TEST=1
|
||||
- DB=MYSQL
|
||||
|
@ -79,7 +79,7 @@ before_script:
|
|||
- composer validate
|
||||
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:3.x-dev; fi
|
||||
- if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^2; fi;
|
||||
- if ! [[ $HEALTH_TEST ]]; then composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi;
|
||||
- if ! [[ $HEALTH_TEST ]]; then composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi;
|
||||
- if [[ $HEALTH_TEST ]]; then composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile --no-dev; fi;
|
||||
|
||||
# Start behat services
|
||||
|
@ -90,8 +90,8 @@ before_script:
|
|||
- if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); sleep 3; fi
|
||||
|
||||
script:
|
||||
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit --testsuite $PHPUNIT_TEST; fi
|
||||
- if [[ $BEHAT_TEST ]]; then vendor/bin/behat $BEHAT_TEST; fi
|
||||
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit --testsuite "$PHPUNIT_TEST"; fi
|
||||
- if [[ $BEHAT_TEST ]]; then vendor/bin/behat "$BEHAT_TEST"; fi
|
||||
- if [[ $HEALTH_TEST ]]; then curl -vfL http://localhost:8080/dev/build?flush; fi
|
||||
- if [[ $HEALTH_TEST ]]; then curl -vfL http://localhost:8080/admin; fi
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
"silverstripe-themes/simple": "~3.2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^7"
|
||||
"phpunit/phpunit": "7.1.3"
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
|
|
|
@ -1,24 +1,24 @@
|
|||
<?xml version="1.0"?>
|
||||
<ruleset name="SS3">
|
||||
<description>Coding standard for SilverStripe 4.x</description>
|
||||
<description>Coding standard for SilverStripe 4.x</description>
|
||||
|
||||
<!-- Don't sniff third party libraries -->
|
||||
<exclude-pattern>*/vendor/*</exclude-pattern>
|
||||
<exclude-pattern>*/thirdparty/*</exclude-pattern>
|
||||
<!-- Don't sniff third party libraries -->
|
||||
<exclude-pattern>*/vendor/*</exclude-pattern>
|
||||
<exclude-pattern>*/thirdparty/*</exclude-pattern>
|
||||
|
||||
<!-- Show progress and output sniff names on violation, and add colours -->
|
||||
<arg value="sp"/>
|
||||
<arg name="colors"/>
|
||||
<!-- Show progress and output sniff names on violation, and add colours -->
|
||||
<arg value="sp"/>
|
||||
<arg name="colors"/>
|
||||
|
||||
<!-- Use PSR-2 as a base standard -->
|
||||
<rule ref="PSR2">
|
||||
<!-- Allow classes to not declare a namespace -->
|
||||
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
|
||||
<!-- Use PSR-2 as a base standard -->
|
||||
<rule ref="PSR2">
|
||||
<!-- Allow classes to not declare a namespace -->
|
||||
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
|
||||
|
||||
<!-- Allow underscores in class names -->
|
||||
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
|
||||
<!-- Allow underscores in class names -->
|
||||
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
|
||||
|
||||
<!-- Allow non camel cased method names -->
|
||||
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
|
||||
</rule>
|
||||
<!-- Allow non camel cased method names -->
|
||||
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
|
||||
</rule>
|
||||
</ruleset>
|
||||
|
|
|
@ -1,57 +1,51 @@
|
|||
<!--
|
||||
PHPUnit configuration for SilverStripe
|
||||
|
||||
Requires PHPUnit 7+
|
||||
Requires PHPUnit ^7.1
|
||||
|
||||
Usage:
|
||||
- "vendor/bin/phpunit": Runs all tests in all folders
|
||||
- "vendor/bin/phpunit vendor/silverstripe/framework/tests/": Run all tests of the framework module
|
||||
- "vendor/bin/phpunit <dash><dash>group admin": Run all tests within the core test group
|
||||
(replace <dash> with "-", requires xdebug)
|
||||
- "vendor/bin/phpunit <dash><dash>testsuite admin": Run all tests within the core test group
|
||||
(replace <dash> with "-")
|
||||
- "vendor/bin/phpunit <dash><dash>filter FolderTest vendor/silverstripe/framework/tests": Run a single test
|
||||
- "phpunit <dash><dash>coverage-html assets/": Generate coverage report
|
||||
- "phpunit <dash><dash>coverage-html assets/": Generate coverage report (requires xdebug or phpdbg)
|
||||
|
||||
More information:
|
||||
- http://www.phpunit.de/manual/current/en/textui.html
|
||||
- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
|
||||
- https://www.phpunit.de
|
||||
- https://doc.silverstripe.org/framework/en/topics/testing/#configuration
|
||||
|
||||
It is safe to remove this file for normal website operation.
|
||||
-->
|
||||
<phpunit
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.0/phpunit.xsd"
|
||||
bootstrap="vendor/silverstripe/framework/tests/bootstrap.php"
|
||||
colors="true">
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.1/phpunit.xsd"
|
||||
bootstrap="vendor/silverstripe/framework/tests/bootstrap.php"
|
||||
colors="true"
|
||||
>
|
||||
<testsuites>
|
||||
<testsuite name="Default">
|
||||
<directory>app/tests</directory>
|
||||
<directory>vendor/silverstripe/cms/tests/php</directory>
|
||||
<directory>vendor/silverstripe/framework/tests/php</directory>
|
||||
</testsuite>
|
||||
|
||||
<testsuites>
|
||||
<testsuite name="Default">
|
||||
<directory>mysite/tests</directory>
|
||||
<directory>vendor/silverstripe/cms/tests/php</directory>
|
||||
<directory>vendor/silverstripe/framework/tests/php</directory>
|
||||
</testsuite>
|
||||
<!-- core components -->
|
||||
<testsuite name="core">
|
||||
<directory>vendor/silverstripe/framework/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/assets/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/versioned/tests/php/</directory>
|
||||
</testsuite>
|
||||
|
||||
<!-- core components -->
|
||||
<testsuite name="core">
|
||||
<directory>vendor/silverstripe/framework/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/assets/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/versioned/tests/php/</directory>
|
||||
</testsuite>
|
||||
|
||||
<!-- admin components -->
|
||||
<testsuite name="admin">
|
||||
<directory>vendor/silverstripe/cms/tests/</directory>
|
||||
<directory>vendor/silverstripe/admin/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/asset-admin/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/graphql/tests/</directory>
|
||||
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/reports/tests/</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
|
||||
<groups>
|
||||
<exclude>
|
||||
<group>sanitychecks</group>
|
||||
</exclude>
|
||||
</groups>
|
||||
<!-- admin components -->
|
||||
<testsuite name="admin">
|
||||
<directory>vendor/silverstripe/cms/tests/</directory>
|
||||
<directory>vendor/silverstripe/admin/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/asset-admin/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/graphql/tests/</directory>
|
||||
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
|
||||
<directory>vendor/silverstripe/reports/tests/</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
</phpunit>
|
||||
|
|
Loading…
Reference in New Issue