summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-12-04 11:29:31 +0100
committerGitHub <noreply@github.com>2019-12-04 11:29:31 +0100
commit17eece7fc4470828c3b03d44e0614e70848260a4 (patch)
tree15700c3d4c8ff4e2d8babf0c8fa6336350c57987 /apps
parent738e6bf07926f05791b4eb80d7e63d72f299cd5a (diff)
parent069b938ab0dda5ee4b42e53474a4f3845223df90 (diff)
downloadnextcloud-server-17eece7fc4470828c3b03d44e0614e70848260a4.tar.gz
nextcloud-server-17eece7fc4470828c3b03d44e0614e70848260a4.zip
Merge pull request #18220 from nextcloud/fix/theming/tests
Fix the theming tests
Diffstat (limited to 'apps')
-rw-r--r--apps/theming/tests/Controller/ThemingControllerTest.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php
index 8d4650e68b3..a6aae119ce8 100644
--- a/apps/theming/tests/Controller/ThemingControllerTest.php
+++ b/apps/theming/tests/Controller/ThemingControllerTest.php
@@ -765,6 +765,9 @@ class ThemingControllerTest extends TestCase {
$expected->cacheFor(3600);
$expected->addHeader('Content-Type', 'text/svg');
$expected->addHeader('Content-Disposition', 'attachment; filename="logo"');
+ $csp = new Http\ContentSecurityPolicy();
+ $csp->allowInlineStyle();
+ $expected->setContentSecurityPolicy($csp);
@$this->assertEquals($expected, $this->themingController->getImage('logo'));
}
@@ -793,6 +796,9 @@ class ThemingControllerTest extends TestCase {
$expected->cacheFor(3600);
$expected->addHeader('Content-Type', 'image/png');
$expected->addHeader('Content-Disposition', 'attachment; filename="background"');
+ $csp = new Http\ContentSecurityPolicy();
+ $csp->allowInlineStyle();
+ $expected->setContentSecurityPolicy($csp);
@$this->assertEquals($expected, $this->themingController->getImage('background'));
}