upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Fix UtilTest::testDefaultApps()

Browse source 
Oh wow... This definitly was no best practice... 😒

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
This commit is contained in:
Daniel Rudolf 2021-07-01 16:00:29 +02:00
parent a43de10d1e
commit e16bf707aa
No known key found for this signature in database
GPG key ID: A061F02CD8DE4538
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/private/legacy/OC_Util.php
View file

@ -1089,6 +1089,7 @@ class OC_Util {
* @suppress PhanDeprecatedFunction
*/
public static function getDefaultPageUrl() {
/** @var IURLGenerator $urlGenerator */
$urlGenerator = \OC::$server->get(IURLGenerator::class);
return $urlGenerator->linkToDefaultPageUrl();
}

19
tests/lib/UtilTest.php
View file

@ -187,15 +187,16 @@ class UtilTest extends \Test\TestCase {
->willReturnCallback(function ($appId) use ($enabledApps) {
return in_array($appId, $enabledApps);
});
Dummy_OC_Util::$appManager = $appManager;
$this->overwriteService(IAppManager::class, $appManager);
// need to set a user id to make sure enabled apps are read from cache
\OC_User::setUserId($this->getUniqueID());
\OC::$server->getConfig()->setSystemValue('defaultapp', $defaultAppConfig);
$this->assertEquals('http://localhost/' . $expectedPath, Dummy_OC_Util::getDefaultPageUrl());
$this->assertEquals('http://localhost/' . $expectedPath, OC_Util::getDefaultPageUrl());
// restore old state
\OC::$WEBROOT = $oldWebRoot;
$this->restoreService(IAppManager::class);
\OC::$server->getConfig()->setSystemValue('defaultapp', $oldDefaultApps);
\OC_User::setUserId(null);
}
@ -360,17 +361,3 @@ class UtilTest extends \Test\TestCase {
], \OC_Util::$styles);
}
}
/**
* Dummy OC Util class to make it possible to override the app manager
*/
class Dummy_OC_Util extends OC_Util {
/**
* @var \OCP\App\IAppManager
*/
public static $appManager;
protected static function getAppManager() {
return self::$appManager;
}
}