Update phpunit

This commit is contained in:
brantje 2017-07-01 16:08:44 +02:00
parent 2c0455ead1
commit a1d1fc8ede
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
4 changed files with 6 additions and 12 deletions

View file

@ -33,7 +33,7 @@ PassmanExporter.csv = {
PassmanExporter.csv.export = function (credentials, FileService, EncryptService) {
/** global: C_Promise */
return new C_Promise(function () {
PassmanExporter.getCredentialsWithFiles(credentials, FileService, EncryptService).then((function(data){
PassmanExporter.getCredentialsWithFiles(credentials, FileService, EncryptService).then((function(){
var headers = ['label', 'username', 'password', 'email', 'description', 'tags', 'url', 'custom_fields', 'files'];
var file_data = '"' + headers.join('","') + '"\n';
for (var i = 0; i < credentials.length; i++) {

View file

@ -1,7 +1,7 @@
<phpunit bootstrap="tests/bootstrap.php" colors="true">
<testsuites>
<testsuite name="integration">
<directory>./tests/integration</directory>
<!-- <directory>./tests/integration</directory> -->
</testsuite>
</testsuites>
</phpunit>

View file

@ -2,7 +2,7 @@
<testsuites>
<testsuite name="unit">
<directory>./tests/unit</directory>
<!--<exclude>./tests/unit/lib/Db</exclude>-->
<exclude>./tests/unit/lib/Db</exclude>
</testsuite>
</testsuites>
<filter>
@ -13,8 +13,8 @@
<!--<file>/path/to/file</file>-->
<!--<exclude>-->
<!--<directory suffix=".php">/path/to/dir</directory>-->
<!--<file>/path/to/file</file>-->
<!--<directory suffix=".php">/path/to/dir</directory>-->
<!--<file>/path/to/file</file>-->
<!--</exclude>-->
</whitelist>

View file

@ -9,14 +9,8 @@
* @copyright Sander Brand 2016
*/
$nc_require_base = getenv('SERVER_BASE_DIR');
if ($nc_require_base) {
require_once $nc_require_base . '/tests/bootstrap.php';
}
else{
require_once __DIR__ . '/../../../tests/bootstrap.php';
}
require_once __DIR__ . '/../../../tests/bootstrap.php';
require_once __DIR__ . '/../appinfo/autoload.php';
require_once __DIR__ . '/db/DatabaseHelperTest.php';