upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-18 18:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix tests

Browse source 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Lukas Reschke 2016-10-27 20:13:15 +02:00
parent 32cf661215
commit 8d83e239f3
No known key found for this signature in database
GPG key ID: B9F6980CF6E759B1
6 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files_sharing/tests/UpdaterTest.php
View file

@ -71,7 +71,8 @@ class UpdaterTest extends TestCase {
*/
function testDeleteParentFolder() {
$status = \OC_App::isEnabled('files_trashbin');
\OC_App::enable('files_trashbin');
(new \OC_App())->enable('files_trashbin');
\OCA\Files_Trashbin\Trashbin::registerHooks();

5
core/Command/App/Enable.php
View file

@ -75,11 +75,12 @@ class Enable extends Command implements CompletionAwareInterface {
}
$groups = $input->getOption('groups');
$appClass = new \OC_App();
if (empty($groups)) {
\OC_App::enable($appId);
$appClass->enable($appId);
$output->writeln($appId . ' enabled');
} else {
\OC_App::enable($appId, $groups);
$appClass->enable($appId, $groups);
$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
}
return 0;

7
tests/Settings/Controller/AppSettingsControllerTest.php
View file

@ -29,6 +29,7 @@ use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\ICacheFactory;
use OCP\L10N\IFactory;
use Test\TestCase;
use OCP\IRequest;
use OCP\IL10N;
@ -61,6 +62,8 @@ class AppSettingsControllerTest extends TestCase {
private $categoryFetcher;
/** @var AppFetcher|\PHPUnit_Framework_MockObject_MockObject */
private $appFetcher;
/** @var IFactory|\PHPUnit_Framework_MockObject_MockObject */
private $l10nFactory;
public function setUp() {
parent::setUp();
@ -82,6 +85,7 @@ class AppSettingsControllerTest extends TestCase {
$this->appManager = $this->createMock(IAppManager::class);
$this->categoryFetcher = $this->createMock(CategoryFetcher::class);
$this->appFetcher = $this->createMock(AppFetcher::class);
$this->l10nFactory = $this->createMock(IFactory::class);
$this->appSettingsController = new AppSettingsController(
'settings',
@ -92,7 +96,8 @@ class AppSettingsControllerTest extends TestCase {
$this->navigationManager,
$this->appManager,
$this->categoryFetcher,
$this->appFetcher
$this->appFetcher,
$this->l10nFactory
);
}

2
tests/enable_all.php
View file

@ -10,7 +10,7 @@ require_once __DIR__.'/../lib/base.php';
function enableApp($app) {
try {
OC_App::enable($app);
(new \OC_App())->enable($app);
} catch (Exception $e) {
echo $e;
}

6
tests/lib/InstallerTest.php
View file

@ -49,7 +49,8 @@ class InstallerTest extends TestCase {
]
);
Installer::installApp($data);
$installer = new Installer();
$installer->installApp($data);
$isInstalled = Installer::isInstalled(self::$appid);
$this->assertTrue($isInstalled);
@ -88,7 +89,8 @@ class InstallerTest extends TestCase {
]
);
Installer::installApp($oldData);
$installer = new Installer();
$installer->installApp($oldData);
$oldVersionNumber = \OC_App::getAppVersion(self::$appid);
Installer::updateApp($newData);

2
tests/lib/StreamWrappersTest.php
View file

@ -38,7 +38,7 @@ class StreamWrappersTest extends \Test\TestCase {
public static function tearDownAfterClass() {
if (self::$trashBinStatus) {
\OC_App::enable('files_trashbin');
(new \OC_App())->enable('files_trashbin');
}
}