summaryrefslogtreecommitdiffstats
path: root/tests/Unit
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/Unit
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/Unit')
-rw-r--r--tests/Unit/Controller/PageControllerTest.php8
-rw-r--r--tests/Unit/Service/StatusServiceTest.php7
2 files changed, 9 insertions, 6 deletions
diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
index 5cfba947e..9923befb4 100644
--- a/tests/Unit/Controller/PageControllerTest.php
+++ b/tests/Unit/Controller/PageControllerTest.php
@@ -80,8 +80,8 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase {
->disableOriginalConstructor()
->getMock();
$this->controller = new PageController($this->appName, $this->request,
- $this->settings, $this->urlGenerator, $this->appConfig,
- $this->config, $this->l10n, $this->recommended, $this->status,
+ $this->settings, $this->urlGenerator, $this->config,
+ $this->l10n, $this->recommended, $this->status,
$this->user);
}
@@ -97,7 +97,7 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase {
$response = $this->controller->index();
$this->assertEquals('index', $response->getTemplateName());
- $this->assertSame(false, $response->getParams()['cronWarning']);
+ $this->assertSame(false, $response->getParams()['warnings']['improperlyConfiguredCron']);
}
@@ -112,7 +112,7 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase {
$response = $this->controller->index();
- $this->assertEquals(true, $response->getParams()['cronWarning']);
+ $this->assertEquals(true, $response->getParams()['warnings']['improperlyConfiguredCron']);
}
diff --git a/tests/Unit/Service/StatusServiceTest.php b/tests/Unit/Service/StatusServiceTest.php
index dcd331b99..095bf6247 100644
--- a/tests/Unit/Service/StatusServiceTest.php
+++ b/tests/Unit/Service/StatusServiceTest.php
@@ -33,8 +33,11 @@ class StatusServiceTest extends \PHPUnit_Framework_TestCase {
'\OCA\News\Config\Config')
->disableOriginalConstructor()
->getMock();
- $this->service = new StatusService($this->settings, $this->config,
- $this->appName);
+ $this->db = $this->getMockBuilder("\OCP\IDBConnection")
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->service = new StatusService($this->settings, $this->db,
+ $this->config, $this->appName);
}
private function beforeStatus($cronMode='cron', $cronEnabled=true,