Skip to content

Commit

Permalink
Merge branch 'move-directory'
Browse files Browse the repository at this point in the history
  • Loading branch information
k-holy committed Jul 9, 2014
2 parents ce0809f + 9193c39 commit 6bc18a0
Show file tree
Hide file tree
Showing 32 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<phpunit
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="_Tests/bootstrap.php"
bootstrap="tests/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
Expand All @@ -18,14 +18,14 @@
>
<testsuites>
<testsuite name="Volcanus_Validation">
<directory suffix="Test.php">./_Tests/Volcanus/Validation/Test/</directory>
<directory suffix="Test.php">./tests/Volcanus/Validation/Test/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>./src</directory>
<exclude>
<directory>./_Tests</directory>
<directory>./tests</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
Expand Down
4 changes: 2 additions & 2 deletions testrunner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ general:
test_targets:
recursive: true
resources:
- _Tests
- tests
autotest:
enabled: false
watch_dirs:
- src
- _Tests
- tests
notify: true

phpunit:
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 6bc18a0

Please sign in to comment.