summaryrefslogtreecommitdiffstats
path: root/apps/provisioning_api/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-04-07 15:42:43 -0500
committerMorris Jobke <hey@morrisjobke.de>2017-04-09 21:43:01 -0500
commit5b4adf66e51e21b3ecbd683397a362b60f792a50 (patch)
tree8bdc129ac9fd6575ee41be438ff667e49f7110a2 /apps/provisioning_api/tests
parentca9d25169dcdd2923a356e2a797d8704506a3787 (diff)
downloadnextcloud-server-5b4adf66e51e21b3ecbd683397a362b60f792a50.tar.gz
nextcloud-server-5b4adf66e51e21b3ecbd683397a362b60f792a50.zip
Move OC_Defaults to OCP\Defaults
* currently there are two ways to access default values: OCP\Defaults or OC_Defaults (which is extended by OCA\Theming\ThemingDefaults) * our code used a mixture of both of them, which made it hard to work on theme values * this extended the public interface with the missing methods and uses them everywhere to only rely on the public interface Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/provisioning_api/tests')
-rw-r--r--apps/provisioning_api/tests/Controller/UsersControllerTest.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
index 24516840a7a..24de84a0690 100644
--- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -37,10 +37,10 @@ use OC\Settings\Mailer\NewUserMailHelper;
use OC\SubAdmin;
use OCA\Provisioning_API\Controller\UsersController;
use OCP\AppFramework\Http\DataResponse;
+use OCP\Defaults;
use OCP\IConfig;
use OCP\IGroup;
use OCP\ILogger;
-use OCP\AppFramework\Http\TemplateResponse;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IURLGenerator;
@@ -74,7 +74,7 @@ class UsersControllerTest extends TestCase {
private $urlGenerator;
/** @var IMailer|PHPUnit_Framework_MockObject_MockObject */
private $mailer;
- /** @var \OC_Defaults|PHPUnit_Framework_MockObject_MockObject */
+ /** @var Defaults|PHPUnit_Framework_MockObject_MockObject */
private $defaults;
/** @var IFactory|PHPUnit_Framework_MockObject_MockObject */
private $l10nFactory;
@@ -93,7 +93,7 @@ class UsersControllerTest extends TestCase {
$this->accountManager = $this->createMock(AccountManager::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->mailer = $this->createMock(IMailer::class);
- $this->defaults = $this->createMock(\OC_Defaults::class);
+ $this->defaults = $this->createMock(Defaults::class);
$this->l10nFactory = $this->createMock(IFactory::class);
$this->newUserMailHelper = $this->createMock(NewUserMailHelper::class);