Skip to content

Commit 54551c4

Browse files
committed
Make tests turn green
Removed custom test config from the repo.
1 parent bb1b131 commit 54551c4

File tree

6 files changed

+37
-97
lines changed

6 files changed

+37
-97
lines changed

.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/vendor
2-
composer.phar
3-
.DS_Store
4-
/.idea/
51
composer.lock
2+
phpunit.xml
3+
phpspec.yml
4+
vendor

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.5.9
5+
- 5.5
66
- 5.6
7+
- 7.0
78
- hhvm
89

9-
matrix:
10-
allow_failures:
11-
- php: hhvm
10+
sudo: false
1211

12+
install:
13+
- travis_retry composer install --no-interaction --prefer-source
14+
1315
before_script:
1416
- curl -s http://getcomposer.org/installer | php
1517
- php composer.phar install --dev --no-interaction
1618
- wget https://scrutinizer-ci.com/ocular.phar
1719
- wget https://phar.phpunit.de/phpcov.phar
20+
1821
script:
1922
- mkdir -p tmp
2023
- vendor/bin/phpspec run -c phpspec.yml.dist
2124
- vendor/bin/phpunit --configuration phpunit.xml.dist
25+
2226
after_script:
2327
- php phpcov.phar merge --clover tmp/coverage.clover tmp
2428
- php ocular.phar code-coverage:upload --format=php-clover tmp/coverage.clover
25-
26-
cache:
27-
directories:
28-
- vendor

phpspec.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

phpspec.yml.dist

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,5 @@ suites:
22
package_suite:
33
namespace: LucaDegasperi\OAuth2Server
44
src_path: src
5-
spec_path: tests
65
spec_prefix: unit
7-
extensions:
8-
- PhpSpec\Extension\CodeCoverageExtension
9-
code_coverage:
10-
whitelist:
11-
- src
12-
blacklist_files:
13-
- src/OAuth2ServerServiceProvider.php
14-
- src/Facades/AuthorizerFacade.php
15-
output: tmp/unit-coverage.cov
16-
format: php
6+
spec_path: tests

phpunit.xml

Lines changed: 0 additions & 38 deletions
This file was deleted.

phpunit.xml.dist

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" bootstrap="vendor/autoload.php">
3-
<testsuites>
4-
<testsuite name="Package Test Suite">
5-
<directory suffix=".php">./tests/integration</directory>
6-
</testsuite>
7-
</testsuites>
8-
<filter>
9-
<whitelist>
10-
<directory>./src</directory>
11-
<exclude>
12-
<directory>./build</directory>
13-
<directory>./src/migrations</directory>
14-
<directory>./src/config</directory>
15-
<directory>./src/lang</directory>
16-
<directory>./src/views</directory>
17-
<directory>./composer</directory>
18-
<directory>./tests</directory>
19-
<directory>./travis</directory>
20-
<directory>./vendor</directory>
21-
<directory>./stubs</directory>
22-
<directory>./seeds</directory>
23-
<file>./src/OAuth2ServerServiceProvider.php</file>
24-
<file>./src/Repositories/FluentAdapter.php</file>
25-
</exclude>
26-
</whitelist>
27-
</filter>
28-
<logging>
29-
<log type="coverage-php" target="tmp/integration-coverage.cov"/>
30-
<log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
31-
</logging>
2+
<phpunit backupGlobals="false"
3+
backupStaticAttributes="false"
4+
beStrictAboutTestsThatDoNotTestAnything="true"
5+
beStrictAboutOutputDuringTests="true"
6+
bootstrap="vendor/autoload.php"
7+
colors="true"
8+
convertErrorsToExceptions="true"
9+
convertNoticesToExceptions="true"
10+
convertWarningsToExceptions="true"
11+
processIsolation="false"
12+
stopOnError="false"
13+
stopOnFailure="false"
14+
verbose="true"
15+
>
16+
<testsuites>
17+
<testsuite name="OAuth 2.0 Laravel Test Suite">
18+
<directory suffix="Test.php">./tests</directory>
19+
</testsuite>
20+
</testsuites>
21+
<filter>
22+
<whitelist processUncoveredFilesFromWhitelist="true">
23+
<directory suffix=".php">./src</directory>
24+
</whitelist>
25+
</filter>
3226
</phpunit>
27+

0 commit comments

Comments
 (0)