summaryrefslogtreecommitdiffstats
path: root/tests/Integration
diff options
context:
space:
mode:
authorDaniel Schaal <daniel@schaal.email>2017-06-06 18:20:20 +0200
committerBernhard Posselt <BernhardPosselt@users.noreply.github.com>2017-06-06 18:20:20 +0200
commitb7f20c0f36dd6e0ed65ca93fcec44aa23f2fa203 (patch)
tree8882a0a91cce88683279b9030f126c303da5e7bb /tests/Integration
parentf18aef805e60d3c8c00f4aff0a5c633052e72e34 (diff)
Fix travis build (#178)
* Use stable12 branch for travis * Shorten db indices to max 27 characters to satisfy app:check-code * Use precise container, downgrade to psql 9.4 * Create psql role * Fix ContentController test * Fix PageController and StatusService tests * Use OCP\IDBConnection, OCP\IDb was removed * Extend IntegrationTest from \Test\Testcase, use loginAsUser to login * Require phpunit 5, nextcloud tests not compatible with phpunit 6 Change tests to use phpunit from vendor directory
Diffstat (limited to 'tests/Integration')
-rw-r--r--tests/Integration/IntegrationTest.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/Integration/IntegrationTest.php b/tests/Integration/IntegrationTest.php
index fb39dfd7a..c14d3007a 100644
--- a/tests/Integration/IntegrationTest.php
+++ b/tests/Integration/IntegrationTest.php
@@ -19,7 +19,7 @@ use OCA\News\Db\Item;
use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\IAppContainer;
-use OCP\IDb;
+use OCP\IDBConnection;
use OCP\IUserSession;
use OCP\IUserManager;
@@ -32,7 +32,7 @@ use OCA\News\Db\ItemMapper;
use OCA\News\Db\FolderMapper;
-abstract class IntegrationTest extends PHPUnit_Framework_TestCase {
+abstract class IntegrationTest extends \Test\TestCase {
protected $user = 'test';
protected $userPassword = 'test';
@@ -162,8 +162,7 @@ abstract class IntegrationTest extends PHPUnit_Framework_TestCase {
$userManager = $this->container->query(IUserManager::class);
$userManager->createUser($user, $password);
- $session = $this->container->query(IUserSession::class);
- $session->login($user, $password);
+ $this->loginAsUser($user);
}
/**
@@ -192,9 +191,9 @@ abstract class IntegrationTest extends PHPUnit_Framework_TestCase {
'DELETE FROM `*PREFIX*news_folders` WHERE `user_id` = ?'
];
- $db = $this->container->query(IDb::class);
+ $db = $this->container->query(IDBConnection::class);
foreach ($sql as $query) {
- $db->prepareQuery($query)->execute([$user]);
+ $db->prepare($query)->execute([$user]);
}
}