summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-03-21 13:16:16 +0100
committerBernhard Posselt <nukeawhale@gmail.com>2013-03-21 13:16:16 +0100
commit39d3bc61d81eae92d9615e898bc6dd6b658d71a6 (patch)
tree0914056875d52a085f31d7f7ff070b702c13d9cd /tests
parentdb5ba2b807c3765c9d23b46cd424d2215ed3fc1c (diff)
added all controllers
Diffstat (limited to 'tests')
-rw-r--r--tests/controller/FolderControllerTest.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/controller/FolderControllerTest.php b/tests/controller/FolderControllerTest.php
index 52836b092..531584ddc 100644
--- a/tests/controller/FolderControllerTest.php
+++ b/tests/controller/FolderControllerTest.php
@@ -62,16 +62,16 @@ class FolderControllerTest extends ControllerTestUtility {
/**
* getAll
*/
- public function testGetAllCalled(){
+ public function testFoldersCalled(){
$this->folderBl->expects($this->once())
->method('findAll')
->will($this->returnValue( array() ));
- $this->controller->getAll();
+ $this->controller->folders();
}
- public function testGetAllReturnsFolders(){
+ public function testFoldersReturnsFolders(){
$return = array(
new Folder(),
new Folder(),
@@ -80,7 +80,7 @@ class FolderControllerTest extends ControllerTestUtility {
->method('findAll')
->will($this->returnValue($return));
- $response = $this->controller->getAll();
+ $response = $this->controller->folders();
$expected = array(
'folders' => $return
);
@@ -88,16 +88,16 @@ class FolderControllerTest extends ControllerTestUtility {
}
- public function testGetAllAnnotations(){
- $methodName = 'getAll';
+ public function testFoldersAnnotations(){
+ $methodName = 'folders';
$annotations = array('IsAdminExemption', 'IsSubAdminExemption', 'Ajax');
$this->assertAnnotations($this->controller, $methodName, $annotations);
}
- public function testGetAllReturnsJSON(){
- $response = $this->controller->getAll();
+ public function testFoldersReturnsJSON(){
+ $response = $this->controller->folders();
$this->assertTrue($response instanceof JSONResponse);
}