Skip to content

Commit

Permalink
Merge pull request #26 from Chris53897/feature/migrate-phpunit-config…
Browse files Browse the repository at this point in the history
…-files

chore: migrate phpunit config-files to PHPUnit 9
  • Loading branch information
bresam committed Feb 21, 2024
2 parents d90b832 + 3db2f88 commit 0c14268
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 42 deletions.
33 changes: 20 additions & 13 deletions phpunit.ci.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit colors="true" bootstrap="Tests/autoload.php">
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
colors="true"
bootstrap="Tests/autoload.php"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
>
<testsuites>
<testsuite name="IvoryGoogleMapBundle Test Suite">
<directory suffix="Test.php">./Tests</directory>
<directory>./Tests</directory>
</testsuite>
</testsuites>

<php>
<server name="BROWSER_NAME" value="chrome" />
<server name="SELENIUM_HOST" value="selenium-chrome" />
Expand All @@ -14,20 +18,23 @@
<server name="API_KEY" value="" />
<server name="API_SECRET" value="" />
</php>
<filter>
<whitelist>

<coverage>
<include>
<directory>./</directory>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
</filter>
</include>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>

<groups>
<exclude>
<!-- Temporarily disabled due to incorrect batch execution errors -->
<group>functional</group>
</exclude>
</groups>
</phpunit>

</phpunit>
65 changes: 36 additions & 29 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,32 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
colors="true"
bootstrap="Tests/autoload.php"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
>
<testsuites>
<testsuite name="IvoryGoogleMapBundle Test Suite">
<directory>./Tests</directory>
</testsuite>
</testsuites>

<php>
<server name="API_KEY" value="AIzaSyAbfXoOk_L4Ryk6aFvdqeAJvbg1ShYiqAE"/>
<server name="API_SECRET" value="78BBhyDNOeFG_PWqHi6XUJ3woJE="/>
<server name="BROWSER_NAME" value="chrome"/>
<server name="SELENIUM_HOST" value="selenium-chrome"/>
<server name="CACHE_PATH" value="Tests/.cache"/>
<server name="CACHE_RESET" value="false"/>
</php>

<coverage>
<include>
<directory>./</directory>
</include>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</coverage>

<groups>
<exclude>
<group>functional</group>
</exclude>
</groups>

<phpunit colors="true" bootstrap="Tests/autoload.php">
<testsuites>
<testsuite name="IvoryGoogleMapBundle Test Suite">
<directory suffix="Test.php">./Tests</directory>
</testsuite>
</testsuites>
<php>
<server name="API_KEY" value="AIzaSyAbfXoOk_L4Ryk6aFvdqeAJvbg1ShYiqAE" />
<server name="API_SECRET" value="78BBhyDNOeFG_PWqHi6XUJ3woJE=" />
<server name="BROWSER_NAME" value="chrome" />
<server name="SELENIUM_HOST" value="selenium-chrome" />
<server name="CACHE_PATH" value="Tests/.cache" />
<server name="CACHE_RESET" value="false" />
</php>
<filter>
<whitelist>
<directory>./</directory>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
</filter>
<groups>
<exclude>
<group>functional</group>
</exclude>
</groups>
</phpunit>

0 comments on commit 0c14268

Please sign in to comment.