Skip to content

Commit

Permalink
Merge pull request silverstripe#10 from open-sausages/pulls/4.0/embed…
Browse files Browse the repository at this point in the history
…-deps

Update build dependencies
  • Loading branch information
flamerohr authored Apr 4, 2017
2 parents 00f00b3 + a867fa0 commit 5779037
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ before_script:
- phpenv config-rm xdebug.ini
- composer validate
- composer install --prefer-dist
- composer require silverstripe/framework:4.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/config:1.0.x-dev --prefer-dist
- composer require silverstripe/framework:4.0.x-dev embed/embed:^3.0@stable silverstripe/assets:1.0.x-dev silverstripe/config:1.0.x-dev --prefer-dist
- "if [ \"$DB\" = \"PGSQL\" ]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi"
- "if [ \"$DB\" = \"SQLITE\" ]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi"

Expand Down
41 changes: 2 additions & 39 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,46 +1,9 @@
<!--
PHPUnit configuration for SilverStripe
Requires PHPUnit 3.5+
Usage:
- "phpunit": Runs all tests in all folders
- "phpunit framework/tests/": Run all tests of the framework module
- "phpunit framework/tests/filesystem": Run all filesystem tests within the framework module
- "phpunit framework/tests/filesystem/FolderTest.php": Run a single test
- "phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> with "-", requires xdebug)
More information:
- http://www.phpunit.de/manual/current/en/textui.html
- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
It is safe to remove this file for normal website operation.
Standard module phpunit configuration.
Requires PHPUnit ^5.7
-->
<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">

<testsuite name="Default">
<directory>tests/php</directory>
<directory>framework/tests/php</directory>
<directory>silverstripe-assets/tests/php</directory>
</testsuite>

<listeners>
<listener class="SilverStripe\Dev\TestListener" />
</listeners>

<groups>
<exclude>
<group>sanitychecks</group>
</exclude>
</groups>

<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">.</directory>
<exclude>
<directory suffix=".php">tests/php/</directory>
</exclude>
</whitelist>
</filter>

</phpunit>

0 comments on commit 5779037

Please sign in to comment.