summaryrefslogtreecommitdiffstats
path: root/tests/controller
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-02-02 00:28:09 +0100
committerBernhard Posselt <nukeawhale@gmail.com>2013-02-02 00:28:09 +0100
commitf8311696720f805567bdf1e66c5cf7a8df359900 (patch)
treeb73a8826e355b04970049ef17fab5afe3966defb /tests/controller
parent374ad065e264c0eaa98232d959523351d3238b10 (diff)
added ajax annotation
Diffstat (limited to 'tests/controller')
-rw-r--r--tests/controller/FolderControllerTest.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/controller/FolderControllerTest.php b/tests/controller/FolderControllerTest.php
index bec8ec788..f1a853400 100644
--- a/tests/controller/FolderControllerTest.php
+++ b/tests/controller/FolderControllerTest.php
@@ -80,7 +80,7 @@ class FolderControllerTest extends ControllerTestUtility {
public function testGetAllAnnotations(){
$methodName = 'getAll';
- $annotations = array('IsAdminExemption', 'IsSubAdminExemption');
+ $annotations = array('IsAdminExemption', 'IsSubAdminExemption', 'Ajax');
$this->assertAnnotations($this->controller, $methodName, $annotations);
}
@@ -90,7 +90,7 @@ class FolderControllerTest extends ControllerTestUtility {
$this->folderMapper->expects($this->once())
->method('getAll')
->will($this->returnValue( array() ));
-
+
$response = $this->controller->getAll();
$this->assertTrue($response instanceof JSONResponse);