Merge pull request #480 from lucadegasperi/tests

Make tests turn green

Author: lucadegasperi

.gitignore

@@ -1,5 +1,4 @@
-/vendor
-composer.phar
-.DS_Store
-/.idea/
 composer.lock
+phpunit.xml
+phpspec.yml
+vendor

.travis.yml

@@ -1,28 +1,26 @@
 language: php
 
 php:
-  - 5.5
   - 5.5.9
+  - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 matrix:
+  fast_finish: true
   allow_failures:
-    - php: hhvm
+    - php: 7.0  
 
-before_script:
-  - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install --dev --no-interaction
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - wget https://phar.phpunit.de/phpcov.phar
+sudo: false
+    
+install:
+  - travis_retry composer install --no-interaction --prefer-source
+  
 script:
-  - mkdir -p tmp
-  - vendor/bin/phpspec run -c phpspec.yml.dist
-  - vendor/bin/phpunit --configuration phpunit.xml.dist
-after_script:
-  - php phpcov.phar merge --clover tmp/coverage.clover tmp
-  - php ocular.phar code-coverage:upload --format=php-clover tmp/coverage.clover
+  - if [ "$TRAVIS_PHP_VERSION" != "5.5.9" ] && [ "$TRAVIS_PHP_VERSION" != "5.5" ] && [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then vendor/bin/phpunit; vendor/bin/phpspec run; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
 
-cache:
-  directories:
-    - vendor
+after_script:
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi

phpspec.yml

@@ -2,15 +2,5 @@ suites:
   package_suite:
     namespace: LucaDegasperi\OAuth2Server
     src_path: src
-    spec_path: tests
     spec_prefix: unit
-extensions:
-  - PhpSpec\Extension\CodeCoverageExtension
-code_coverage:
-  whitelist:
-    - src
-  blacklist_files:
-    - src/OAuth2ServerServiceProvider.php
-    - src/Facades/AuthorizerFacade.php
-  output: tmp/unit-coverage.cov
-  format: php
+    spec_path: tests

phpspec.yml.dist

@@ -1,32 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/integration</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-            <exclude>
-                <directory>./build</directory>
-                <directory>./src/migrations</directory>
-                <directory>./src/config</directory>
-                <directory>./src/lang</directory>
-                <directory>./src/views</directory>
-                <directory>./composer</directory>
-                <directory>./tests</directory>
-                <directory>./travis</directory>
-                <directory>./vendor</directory>
-                <directory>./stubs</directory>
-                <directory>./seeds</directory>
-                <file>./src/OAuth2ServerServiceProvider.php</file>
-                <file>./src/Repositories/FluentAdapter.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-php" target="tmp/integration-coverage.cov"/>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
-    </logging>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         verbose="true"
+>
+   <testsuites>
+       <testsuite name="OAuth 2.0 Laravel Test Suite">
+           <directory suffix="Test.php">./tests</directory>
+       </testsuite>
+   </testsuites>
+   <filter>
+       <whitelist processUncoveredFilesFromWhitelist="true">
+           <directory suffix=".php">./src</directory>
+       </whitelist>
+   </filter>
 </phpunit>
+