Skip to content

Commit

Permalink
Use 2.2.1 version of google/apiclient and fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
nbourguig committed Apr 26, 2017
1 parent d9514b1 commit 385d293
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.*",
"illuminate/console": "5.1.* || 5.2.* || 5.3.* || 5.4.*",
"illuminate/filesystem": "5.1.* || 5.2.* || 5.3.* || 5.4.*",
"google/apiclient": "^2.0"
"google/apiclient": "2.1.2"
},
"require-dev": {
"phpunit/phpunit": "4.*",
Expand Down
38 changes: 38 additions & 0 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="true">
<testsuites>
<testsuite name="Laravel Translation Sheet Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
<logging>
<log type="tap" target="build/report.tap"/>
<log type="junit" target="build/report.junit.xml"/>
<log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
<log type="coverage-text" target="build/coverage.txt"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
</logging>
<php>
<env name="APP_KEY" value="3fifSECXIvnK5r28GVIWUAxmbBSjAjkO"/>

<env name="TS_SPREADSHEET_ID" value=""/>
<env name="TS_SERVICE_ACCOUNT_CREDENTIALS_FILE" value="tests/fixtures/service-account.json"/>
<env name="TS_SERVICE_ACCOUNT_EMAIL" value=""/>
<env name="TS_LOCALES" value="en,fr"/>

</php>
</phpunit>
2 changes: 1 addition & 1 deletion tests/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Kernel extends \Illuminate\Foundation\Console\Kernel
*
* @throws \Exception
*/
protected function reportException(Exception $e)
protected function reportException(\Exception $e)
{
throw $e;
}
Expand Down

0 comments on commit 385d293

Please sign in to comment.