diff options
Diffstat (limited to 'tests/unit/controller')
-rw-r--r-- | tests/unit/controller/ExportControllerTest.php | 6 | ||||
-rw-r--r-- | tests/unit/controller/FeedControllerTest.php | 2 | ||||
-rw-r--r-- | tests/unit/controller/FolderControllerTest.php | 2 | ||||
-rw-r--r-- | tests/unit/controller/ItemControllerTest.php | 2 | ||||
-rw-r--r-- | tests/unit/controller/PageControllerTest.php | 3 | ||||
-rw-r--r-- | tests/unit/controller/UserSettingsControllerTest.php | 2 |
6 files changed, 7 insertions, 10 deletions
diff --git a/tests/unit/controller/ExportControllerTest.php b/tests/unit/controller/ExportControllerTest.php index 0970993ca..b79574ff2 100644 --- a/tests/unit/controller/ExportControllerTest.php +++ b/tests/unit/controller/ExportControllerTest.php @@ -73,15 +73,13 @@ class ExportControllerTest extends ControllerTestUtility { public function testOpmlAnnotations(){ - $annotations = array('IsAdminExemption', 'IsSubAdminExemption', - 'CSRFExemption'); + $annotations = array('NoAdminRequired', 'NoCSRFRequired'); $this->assertAnnotations($this->controller, 'opml', $annotations); } public function testArticlesAnnotations(){ - $annotations = array('IsAdminExemption', 'IsSubAdminExemption', - 'CSRFExemption'); + $annotations = array('NoAdminRequired', 'NoCSRFRequired'); $this->assertAnnotations($this->controller, 'articles', $annotations); } diff --git a/tests/unit/controller/FeedControllerTest.php b/tests/unit/controller/FeedControllerTest.php index 899cebfc0..ac7b998cb 100644 --- a/tests/unit/controller/FeedControllerTest.php +++ b/tests/unit/controller/FeedControllerTest.php @@ -71,7 +71,7 @@ class FeedControllerTest extends ControllerTestUtility { } private function assertFeedControllerAnnotations($methodName){ - $annotations = array('IsAdminExemption', 'IsSubAdminExemption', 'Ajax'); + $annotations = array('NoAdminRequired'); $this->assertAnnotations($this->controller, $methodName, $annotations); } diff --git a/tests/unit/controller/FolderControllerTest.php b/tests/unit/controller/FolderControllerTest.php index 12a9078ea..a26fc3151 100644 --- a/tests/unit/controller/FolderControllerTest.php +++ b/tests/unit/controller/FolderControllerTest.php @@ -75,7 +75,7 @@ class FolderControllerTest extends ControllerTestUtility { private function assertFolderControllerAnnotations($methodName){ - $annotations = array('IsAdminExemption', 'IsSubAdminExemption', 'Ajax'); + $annotations = array('NoAdminRequired'); $this->assertAnnotations($this->controller, $methodName, $annotations); } diff --git a/tests/unit/controller/ItemControllerTest.php b/tests/unit/controller/ItemControllerTest.php index 14c1a3fa4..8089ed2f1 100644 --- a/tests/unit/controller/ItemControllerTest.php +++ b/tests/unit/controller/ItemControllerTest.php @@ -81,7 +81,7 @@ class ItemControllerTest extends ControllerTestUtility { private function assertItemControllerAnnotations($methodName){ - $annotations = array('IsAdminExemption', 'IsSubAdminExemption', 'Ajax'); + $annotations = array('NoAdminRequired'); $this->assertAnnotations($this->controller, $methodName, $annotations); } diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php index d2cd4b8af..86534e861 100644 --- a/tests/unit/controller/PageControllerTest.php +++ b/tests/unit/controller/PageControllerTest.php @@ -51,8 +51,7 @@ class PageControllerTest extends ControllerTestUtility { public function testOpmlAnnotations(){ - $annotations = array('IsAdminExemption', 'IsSubAdminExemption', - 'CSRFExemption'); + $annotations = array('NoAdminRequired', 'NoCSRFRequired'); $this->assertAnnotations($this->controller, 'index', $annotations); } diff --git a/tests/unit/controller/UserSettingsControllerTest.php b/tests/unit/controller/UserSettingsControllerTest.php index 9a8dcf5fd..87a898376 100644 --- a/tests/unit/controller/UserSettingsControllerTest.php +++ b/tests/unit/controller/UserSettingsControllerTest.php @@ -52,7 +52,7 @@ class UserSettingsControllerTest extends ControllerTestUtility { private function assertUserSettingsControllerAnnotations($methodName){ - $annotations = array('IsAdminExemption', 'IsSubAdminExemption', 'Ajax'); + $annotations = array('NoAdminRequired'); $this->assertAnnotations($this->controller, $methodName, $annotations); } |