summaryrefslogtreecommitdiffstats
path: root/apps/theming/tests/Controller/ThemingControllerTest.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/theming/tests/Controller/ThemingControllerTest.php')
-rw-r--r--apps/theming/tests/Controller/ThemingControllerTest.php198
1 files changed, 68 insertions, 130 deletions
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index 08af13f994b..dda881525f0 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -34,6 +34,7 @@ use OC\Files\AppData\Factory;
use OC\L10N\L10N;
use OC\Template\SCSSCacher;
use OCA\Theming\Controller\ThemingController;
+use OCA\Theming\ImageManager;
use OCA\Theming\Util;
use OCP\App\IAppManager;
use OCP\AppFramework\Http;
@@ -74,6 +75,8 @@ class ThemingControllerTest extends TestCase {
private $appManager;
/** @var IAppData|\PHPUnit_Framework_MockObject_MockObject */
private $appData;
+ /** @var ImageManager|\PHPUnit_Framework_MockObject_MockObject */
+ private $imageManager;
/** @var SCSSCacher */
private $scssCacher;
/** @var IURLGenerator */
@@ -94,6 +97,7 @@ class ThemingControllerTest extends TestCase {
$this->tempManager = \OC::$server->getTempManager();
$this->scssCacher = $this->createMock(SCSSCacher::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
+ $this->imageManager = $this->createMock(ImageManager::class);
$this->themingController = new ThemingController(
'theming',
@@ -107,7 +111,8 @@ class ThemingControllerTest extends TestCase {
$this->appData,
$this->scssCacher,
$this->urlGenerator,
- $this->appManager
+ $this->appManager,
+ $this->imageManager
);
return parent::setUp();
@@ -211,17 +216,12 @@ class ThemingControllerTest extends TestCase {
$this->request
->expects($this->at(0))
->method('getParam')
- ->with('backgroundColor')
- ->willReturn(false);
+ ->with('key')
+ ->willReturn('logo');
$this->request
->expects($this->at(1))
->method('getUploadedFile')
- ->with('uploadlogo')
- ->willReturn(null);
- $this->request
- ->expects($this->at(2))
- ->method('getUploadedFile')
- ->with('upload-login-background')
+ ->with('image')
->willReturn(null);
$this->l10n
->expects($this->any())
@@ -241,30 +241,25 @@ class ThemingControllerTest extends TestCase {
Http::STATUS_UNPROCESSABLE_ENTITY
);
- $this->assertEquals($expected, $this->themingController->updateLogo());
+ $this->assertEquals($expected, $this->themingController->uploadImage());
}
public function testUpdateLogoInvalidMimeType() {
$this->request
->expects($this->at(0))
->method('getParam')
- ->with('backgroundColor')
- ->willReturn(false);
+ ->with('key')
+ ->willReturn('logo');
$this->request
->expects($this->at(1))
->method('getUploadedFile')
- ->with('uploadlogo')
+ ->with('image')
->willReturn([
'tmp_name' => 'logo.pdf',
'type' => 'application/pdf',
'name' => 'logo.pdf',
'error' => 0,
]);
- $this->request
- ->expects($this->at(2))
- ->method('getUploadedFile')
- ->with('upload-login-background')
- ->willReturn(null);
$this->l10n
->expects($this->any())
->method('t')
@@ -290,30 +285,7 @@ class ThemingControllerTest extends TestCase {
Http::STATUS_UNPROCESSABLE_ENTITY
);
- $this->assertEquals($expected, $this->themingController->updateLogo());
- }
-
- public function testUpdateBackgroundColor() {
- $this->request
- ->expects($this->at(0))
- ->method('getParam')
- ->with('backgroundColor')
- ->willReturn(true);
- $this->themingDefaults
- ->expects($this->once())
- ->method('set')
- ->with('backgroundMime', 'backgroundColor');
- $expected = new DataResponse(
- [
- 'data' =>
- [
- 'name' => 'backgroundColor',
- 'message' => $this->l10n->t('Saved')
- ],
- 'status' => 'success'
- ]
- );
- $this->assertEquals($expected, $this->themingController->updateLogo());
+ $this->assertEquals($expected, $this->themingController->uploadImage());
}
public function dataUpdateImages() {
@@ -336,23 +308,18 @@ class ThemingControllerTest extends TestCase {
$this->request
->expects($this->at(0))
->method('getParam')
- ->with('backgroundColor')
- ->willReturn(false);
+ ->with('key')
+ ->willReturn('logo');
$this->request
->expects($this->at(1))
->method('getUploadedFile')
- ->with('uploadlogo')
+ ->with('image')
->willReturn([
'tmp_name' => $tmpLogo,
'type' => $mimeType,
'name' => 'logo.svg',
'error' => 0,
]);
- $this->request
- ->expects($this->at(2))
- ->method('getUploadedFile')
- ->with('upload-login-background')
- ->willReturn(null);
$this->l10n
->expects($this->any())
->method('t')
@@ -385,18 +352,27 @@ class ThemingControllerTest extends TestCase {
->method('newFile')
->with('logo')
->willReturn($file);
+ $this->urlGenerator->expects($this->once())
+ ->method('linkTo')
+ ->willReturn('serverCss');
+ $this->imageManager->expects($this->once())
+ ->method('getImageUrl')
+ ->with('logo')
+ ->willReturn('imageUrl');
$expected = new DataResponse(
[
'data' =>
[
'name' => 'logo.svg',
'message' => 'Saved',
+ 'url' => 'imageUrl',
+ 'serverCssUrl' => 'serverCss'
],
'status' => 'success'
]
);
- $this->assertEquals($expected, $this->themingController->updateLogo());
+ $this->assertEquals($expected, $this->themingController->uploadImage());
}
/** @dataProvider dataUpdateImages */
@@ -408,17 +384,12 @@ class ThemingControllerTest extends TestCase {
$this->request
->expects($this->at(0))
->method('getParam')
- ->with('backgroundColor')
- ->willReturn(false);
+ ->with('key')
+ ->willReturn('background');
$this->request
->expects($this->at(1))
->method('getUploadedFile')
- ->with('uploadlogo')
- ->willReturn(null);
- $this->request
- ->expects($this->at(2))
- ->method('getUploadedFile')
- ->with('upload-login-background')
+ ->with('image')
->willReturn([
'tmp_name' => $tmpLogo,
'type' => 'text/svg',
@@ -457,17 +428,26 @@ class ThemingControllerTest extends TestCase {
->with('background')
->willReturn($file);
+ $this->urlGenerator->expects($this->once())
+ ->method('linkTo')
+ ->willReturn('serverCss');
+ $this->imageManager->expects($this->once())
+ ->method('getImageUrl')
+ ->with('background')
+ ->willReturn('imageUrl');
$expected = new DataResponse(
[
'data' =>
[
'name' => 'logo.svg',
'message' => 'Saved',
+ 'url' => 'imageUrl',
+ 'serverCssUrl' => 'serverCss'
],
'status' => 'success'
]
);
- $this->assertEquals($expected, $this->themingController->updateLogo());
+ $this->assertEquals($expected, $this->themingController->uploadImage());
}
public function testUpdateLogoLoginScreenUploadWithInvalidImage() {
@@ -478,20 +458,15 @@ class ThemingControllerTest extends TestCase {
$this->request
->expects($this->at(0))
->method('getParam')
- ->with('backgroundColor')
- ->willReturn(false);
+ ->with('key')
+ ->willReturn('logo');
$this->request
->expects($this->at(1))
->method('getUploadedFile')
- ->with('uploadlogo')
- ->willReturn(null);
- $this->request
- ->expects($this->at(2))
- ->method('getUploadedFile')
- ->with('upload-login-background')
+ ->with('image')
->willReturn([
'tmp_name' => $tmpLogo,
- 'type' => 'text/svg',
+ 'type' => 'foobar',
'name' => 'logo.svg',
'error' => 0,
]);
@@ -519,7 +494,7 @@ class ThemingControllerTest extends TestCase {
],
Http::STATUS_UNPROCESSABLE_ENTITY
);
- $this->assertEquals($expected, $this->themingController->updateLogo());
+ $this->assertEquals($expected, $this->themingController->uploadImage());
}
public function dataPhpUploadErrors() {
@@ -541,17 +516,12 @@ class ThemingControllerTest extends TestCase {
$this->request
->expects($this->at(0))
->method('getParam')
- ->with('backgroundColor')
- ->willReturn(false);
+ ->with('key')
+ ->willReturn('background');
$this->request
->expects($this->at(1))
->method('getUploadedFile')
- ->with('uploadlogo')
- ->willReturn(null);
- $this->request
- ->expects($this->at(2))
- ->method('getUploadedFile')
- ->with('upload-login-background')
+ ->with('image')
->willReturn([
'tmp_name' => '',
'type' => 'text/svg',
@@ -575,7 +545,7 @@ class ThemingControllerTest extends TestCase {
],
Http::STATUS_UNPROCESSABLE_ENTITY
);
- $this->assertEquals($expected, $this->themingController->updateLogo());
+ $this->assertEquals($expected, $this->themingController->uploadImage());
}
/**
@@ -585,23 +555,18 @@ class ThemingControllerTest extends TestCase {
$this->request
->expects($this->at(0))
->method('getParam')
- ->with('backgroundColor')
- ->willReturn(false);
+ ->with('key')
+ ->willReturn('background');
$this->request
->expects($this->at(1))
->method('getUploadedFile')
- ->with('uploadlogo')
+ ->with('image')
->willReturn([
'tmp_name' => '',
'type' => 'text/svg',
'name' => 'logo.svg',
'error' => $error,
]);
- $this->request
- ->expects($this->at(2))
- ->method('getUploadedFile')
- ->with('upload-login-background')
- ->willReturn(null);
$this->l10n
->expects($this->any())
->method('t')
@@ -619,7 +584,7 @@ class ThemingControllerTest extends TestCase {
],
Http::STATUS_UNPROCESSABLE_ENTITY
);
- $this->assertEquals($expected, $this->themingController->updateLogo());
+ $this->assertEquals($expected, $this->themingController->uploadImage());
}
public function testUndo() {
@@ -687,21 +652,9 @@ class ThemingControllerTest extends TestCase {
->method('linkTo')
->with('', '/core/css/someHash-server.scss')
->willReturn('/nextcloudWebroot/core/css/someHash-server.scss');
- $folder = $this->createMock(ISimpleFolder::class);
- $file = $this->createMock(ISimpleFile::class);
- $this->appData
- ->expects($this->once())
- ->method('getFolder')
- ->with('images')
- ->willReturn($folder);
- $folder
- ->expects($this->once())
- ->method('getFile')
- ->with($filename)
- ->willReturn($file);
- $file
- ->expects($this->once())
- ->method('delete');
+ $this->imageManager->expects($this->once())
+ ->method('delete')
+ ->with($filename);
$expected = new DataResponse(
[
@@ -720,27 +673,19 @@ class ThemingControllerTest extends TestCase {
public function testGetLogoNotExistent() {
- $this->appData->method('getFolder')
- ->with($this->equalTo('images'))
+ $this->imageManager->method('getImage')
+ ->with($this->equalTo('logo'))
->willThrowException(new NotFoundException());
$expected = new Http\NotFoundResponse();
- $this->assertEquals($expected, $this->themingController->getLogo());
+ $this->assertEquals($expected, $this->themingController->getImage('logo'));
}
public function testGetLogo() {
$file = $this->createMock(ISimpleFile::class);
- $folder = $this->createMock(ISimpleFolder::class);
- $this->appData
- ->expects($this->once())
- ->method('getFolder')
- ->with('images')
- ->willReturn($folder);
- $folder->expects($this->once())
- ->method('getFile')
- ->with('logo')
+ $this->imageManager->expects($this->once())
+ ->method('getImage')
->willReturn($file);
-
$this->config
->expects($this->once())
->method('getAppValue')
@@ -755,29 +700,22 @@ class ThemingControllerTest extends TestCase {
$expected->addHeader('Expires', $expires->format(\DateTime::RFC2822));
$expected->addHeader('Pragma', 'cache');
$expected->addHeader('Content-Type', 'text/svg');
- @$this->assertEquals($expected, $this->themingController->getLogo());
+ @$this->assertEquals($expected, $this->themingController->getImage('logo'));
}
public function testGetLoginBackgroundNotExistent() {
- $this->appData->method('getFolder')
- ->with($this->equalTo('images'))
+ $this->imageManager->method('getImage')
+ ->with($this->equalTo('background'))
->willThrowException(new NotFoundException());
$expected = new Http\NotFoundResponse();
- $this->assertEquals($expected, $this->themingController->getLoginBackground());
+ $this->assertEquals($expected, $this->themingController->getImage('background'));
}
public function testGetLoginBackground() {
$file = $this->createMock(ISimpleFile::class);
- $folder = $this->createMock(ISimpleFolder::class);
- $this->appData
- ->expects($this->once())
- ->method('getFolder')
- ->with('images')
- ->willReturn($folder);
- $folder->expects($this->once())
- ->method('getFile')
- ->with('background')
+ $this->imageManager->expects($this->once())
+ ->method('getImage')
->willReturn($file);
$this->config
@@ -794,7 +732,7 @@ class ThemingControllerTest extends TestCase {
$expected->addHeader('Expires', $expires->format(\DateTime::RFC2822));
$expected->addHeader('Pragma', 'cache');
$expected->addHeader('Content-Type', 'image/png');
- @$this->assertEquals($expected, $this->themingController->getLoginBackground());
+ @$this->assertEquals($expected, $this->themingController->getImage('background'));
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 18:03:40 +0000