diff --git a/.travis.yml b/.travis.yml index 133c78b8..fe21d0e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,5 @@ php: - 5.3 - 5.4 -script: phpunit --coverage-text --configuration build/phpunit.xml \ No newline at end of file +before_script: composer install +script: phpunit -c build/phpunit.xml \ No newline at end of file diff --git a/build/phpunit.xml b/build/phpunit.xml index 18e40915..792b1799 100644 --- a/build/phpunit.xml +++ b/build/phpunit.xml @@ -1,5 +1,5 @@ - + ../tests/authentication @@ -17,7 +17,8 @@ - + + diff --git a/composer.json b/composer.json index e87e8077..ff2341e4 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "lncd/oauth2", "description": "OAuth 2.0 Framework", - "version": "0.4", + "version": "0.4.1", "homepage": "https://github.com/lncd/OAuth2", "license": "MIT", "require": { diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php new file mode 100644 index 00000000..ff9fb28e --- /dev/null +++ b/tests/Bootstrap.php @@ -0,0 +1,6 @@ + wget http://getcomposer.org/composer.phar\n> php composer.phar install\n"); +} \ No newline at end of file diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php index ef677c7e..36ac49eb 100644 --- a/tests/authentication/server_test.php +++ b/tests/authentication/server_test.php @@ -4,9 +4,6 @@ class Authentication_Server_test extends PHPUnit_Framework_TestCase { public function setUp() { - require_once 'src/OAuth2/Authentication/Server.php'; - require_once 'src/OAuth2/Authentication/Database.php'; - $this->oauth = new Oauth2\Authentication\Server(); require_once 'database_mock.php'; diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php index 707d73ee..7db05113 100644 --- a/tests/resource/server_test.php +++ b/tests/resource/server_test.php @@ -4,9 +4,6 @@ class Resource_Server_test extends PHPUnit_Framework_TestCase { function setUp() { - require_once 'src/OAuth2/Resource/Server.php'; - require_once 'src/OAuth2/Resource/Database.php'; - require_once('database_mock.php'); $this->server = new Oauth2\Resource\Server(); $this->db = new ResourceDB();