Browse Source
Fix tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
pull/1940/head
Lukas Reschke
9 years ago
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
6 changed files with
17 additions and
8 deletions
-
apps/files_sharing/tests/UpdaterTest.php
-
core/Command/App/Enable.php
-
tests/Settings/Controller/AppSettingsControllerTest.php
-
tests/enable_all.php
-
tests/lib/InstallerTest.php
-
tests/lib/StreamWrappersTest.php
|
|
@ -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(); |
|
|
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
@ -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 |
|
|
|
); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -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; |
|
|
|
} |
|
|
|
|
|
@ -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); |
|
|
|
|
|
@ -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'); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|