summaryrefslogtreecommitdiffstats
path: root/apps/files/tests/controller
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-12-02 17:30:40 +0100
committerLukas Reschke <lukas@owncloud.com>2015-12-02 17:30:40 +0100
commit8aaab0dbadf1798bdc11e8fefddad01cf23e1892 (patch)
tree70f36beb3bf235f5d68a33500963fae4552c17ad /apps/files/tests/controller
parent8d218bf3ef842d76c2b97a175b28e13054497952 (diff)
downloadnextcloud-server-8aaab0dbadf1798bdc11e8fefddad01cf23e1892.tar.gz
nextcloud-server-8aaab0dbadf1798bdc11e8fefddad01cf23e1892.zip
Allow framing 'self'
This is required by the pdf viewer, since the files app on master uses the AppFramework it had applied the more strict defaults which made it not work on master.
Diffstat (limited to 'apps/files/tests/controller')
-rw-r--r--apps/files/tests/controller/ViewControllerTest.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files/tests/controller/ViewControllerTest.php b/apps/files/tests/controller/ViewControllerTest.php
index 028dfce8c58..0e8ab5e752d 100644
--- a/apps/files/tests/controller/ViewControllerTest.php
+++ b/apps/files/tests/controller/ViewControllerTest.php
@@ -245,6 +245,9 @@ class ViewControllerTest extends TestCase {
],
]
);
+ $policy = new Http\ContentSecurityPolicy();
+ $policy->addAllowedFrameDomain('\'self\'');
+ $expected->setContentSecurityPolicy($policy);
$this->assertEquals($expected, $this->viewController->index('MyDir', 'MyView'));
}
}