summaryrefslogtreecommitdiffstats
path: root/tests/lib/appframework/controller/ControllerTest.php
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-05-08 11:47:18 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-05-09 23:34:41 +0200
commit9a4d204b55da063631f01a780d32b3fd88c729cd (patch)
tree63d4905af6945ef4c0a8f350a3d85ed8d9d0e391 /tests/lib/appframework/controller/ControllerTest.php
parentaf2b7634eeb8c3bd8ec5dec8b600fbaf8ae5d498 (diff)
downloadnextcloud-server-9a4d204b55da063631f01a780d32b3fd88c729cd.tar.gz
nextcloud-server-9a4d204b55da063631f01a780d32b3fd88c729cd.zip
add cors middleware
remove methodannotationreader namespace fix namespace for server container fix tests fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request remove uneeded local in cors middleware registratio dont uppercase cors to easily use it from routes fix indention comment fixes explicitely set allow credentials header to false dont depend on better controllers PR, fix that stuff later split cors methods to be in a seperate controller for exposing apis remove protected definitions from apicontroller since controller has it
Diffstat (limited to 'tests/lib/appframework/controller/ControllerTest.php')
-rw-r--r--tests/lib/appframework/controller/ControllerTest.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index f17d5f24aa5..b6c83125da1 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -22,10 +22,9 @@
*/
-namespace Test\AppFramework\Controller;
+namespace OCP\AppFramework;
use OC\AppFramework\Http\Request;
-use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
@@ -129,4 +128,5 @@ class ControllerTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals('daheim', $this->controller->env('PATH'));
}
+
}