Changeset 1145

Timestamp:

09/25/08 03:59:35 (2 months ago)

Author:

bermiferrer

Message:

Adding tests for actions access restriction on controllers.

Files:

• trunk/lib/AkActionController.php (modified) (6 diffs)
• trunk/test/unit/lib/AkActionController.php (modified) (1 diff)
• trunk/test/unit/lib/AkActionController/_forbidden_actions.php (added)

trunk/lib/AkActionController.php

@@ -150 +150 @@
-        $this->Response =& $Response;
-        $this->params = $this->Request->getParams();
-
-
+
-        $this->_ensureActionExists();
-
@@ -247 +246 @@
-        return array();
-    }
-
+
-    function getModuleHelper()
-    {
@@ -259 +258 @@
-        return array();
-    }
-
-
+
+
-    function _validateGeneratedXhtml()
-    {
@@ -300 +299 @@
-
-        unset($this->model, $this->models);
-
+
-        foreach ($models as $model){
-            $this->instantiateModelClass($model, (empty($this->finder_options[$model])?array():$this->finder_options[$model]));
@@ -2719 +2718 @@
-    function _ensureActionExists()
-    {
-
+
+
-            if(AK_ENVIRONMENT == 'development'){
-this->_action_name
+action
-                trigger_error(Ak::t('Controller <i>%controller_name</i> can\'t handle action %action_name',
-                array(
-                '%controller_name' => $this->getControllerName(),
-this->_action_name
+action
-                )), E_USER_ERROR);
-            }elseif(@include(AK_PUBLIC_DIR.DS.'405.php')){
@@ -2734 +2734 @@
-            }
-        }
+    }
+
+    function _isActionForbidden()
+    {
+        $methods = get_class_methods('AkActionController');
+        $action = $this->getActionName();
+        return empty($action) || in_array($action , $methods) || $action != AkInflector::underscore($action) || $action[0] == '_';
-    }
-}

trunk/test/unit/lib/AkActionController.php

@@ -15 +15 @@
-
-$partial_tests = array(
+'forbidden_actions',
-'filters',
-'locale_detection',