Updated tests for actionRoutes

rotexsoft · Mar 2, 2025 · ebe5b66 · ebe5b66
1 parent 0dec1a1
commit ebe5b66
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/src/views/base/controller-classes-by-action-methods-report.php b/src/views/base/controller-classes-by-action-methods-report.php
@@ -119,7 +119,7 @@ function(\ReflectionMethod $current_method)use($functionStrStartsWith, $rfclass,
 if ( count($action_methods_by_controller_class_name) > 0 ) {
 
     foreach ( $action_methods_by_controller_class_name  as $controller_class_name=>$action_methods ) {
-        
+
         foreach ( $action_methods as $action_method ) {
 
             $ref_meth_obj = $reflection_methods_map["{$controller_class_name}:{$action_method}"];
@@ -133,7 +133,11 @@ function(\ReflectionMethod $current_method)use($functionStrStartsWith, $rfclass,
                                 ? str_replace('action', '', $ref_meth_obj->getName()) 
                                 : $ref_meth_obj->getName()
                           )
-                        : camelToDashes($ref_meth_obj->getName())
+                        : camelToDashes(
+                            $stripActionPrefixFromMethodName 
+                                ? str_replace('action', '', $ref_meth_obj->getName()) 
+                                : $ref_meth_obj->getName()
+                        )
                 );
 
             foreach ($ref_meth_obj->getParameters() as $parameter) {

diff --git a/tests/AllRoutesTest.php b/tests/AllRoutesTest.php
@@ -607,7 +607,7 @@ public function testBaseControllerActionRoutes() {
 
         // Should contain the /base-controller/action-routes/0/0 page
         $response_body2 = ((string)$response2->getBody());
-
+        
         $expected_output1 = <<<HTML
         <div>
             <div>
@@ -705,6 +705,11 @@ public function testBaseControllerActionRoutes() {
                             <td>SlimMvcTools\Controllers\BaseController</td>
                             <td>forceHttp410</td>
                             <td>base-controller/force-http410/message[/request=NULL]</td>
+                        </tr>
+                                            <tr>
+                            <td>SlimMvcTools\Controllers\BaseController</td>
+                            <td>forceHttp429</td>
+                            <td>base-controller/force-http429/message[/request=NULL]</td>
                         </tr>
                                             <tr>
                             <td>SlimMvcTools\Controllers\BaseController</td>
@@ -969,27 +974,27 @@ public function testBaseControllerActionRoutes() {
                                             <tr>
                             <td>SlimMvcTools\Controllers\BaseController</td>
                             <td>actionIndex</td>
-                            <td>base-controller/action-index</td>
+                            <td>base-controller/index</td>
                         </tr>
                                             <tr>
                             <td>SlimMvcTools\Controllers\BaseController</td>
                             <td>actionLogin</td>
-                            <td>base-controller/action-login</td>
+                            <td>base-controller/login</td>
                         </tr>
                                             <tr>
                             <td>SlimMvcTools\Controllers\BaseController</td>
                             <td>actionLoginStatus</td>
-                            <td>base-controller/action-login-status</td>
+                            <td>base-controller/login-status</td>
                         </tr>
                                             <tr>
                             <td>SlimMvcTools\Controllers\BaseController</td>
                             <td>actionLogout</td>
-                            <td>base-controller/action-logout[/show_status_on_completion=false]</td>
+                            <td>base-controller/logout[/show_status_on_completion=false]</td>
                         </tr>
                                             <tr>
                             <td>SlimMvcTools\Controllers\BaseController</td>
                             <td>actionRoutes</td>
-                            <td>base-controller/action-routes[/onlyPublicMethodsPrefixedWithAction=true][/stripActionPrefixFromMethodName=true]</td>
+                            <td>base-controller/routes[/onlyPublicMethodsPrefixedWithAction=true][/stripActionPrefixFromMethodName=true]</td>
                         </tr>
                                             <tr>
                             <td>SlimMvcTools\Controllers\BaseController</td>
@@ -1020,6 +1025,11 @@ public function testBaseControllerActionRoutes() {
                             <td>SlimMvcTools\Controllers\BaseController</td>
                             <td>forceHttp410</td>
                             <td>base-controller/force-http410/message[/request=NULL]</td>
+                        </tr>
+                                            <tr>
+                            <td>SlimMvcTools\Controllers\BaseController</td>
+                            <td>forceHttp429</td>
+                            <td>base-controller/force-http429/message[/request=NULL]</td>
                         </tr>
                                             <tr>
                             <td>SlimMvcTools\Controllers\BaseController</td>
@@ -1197,22 +1207,22 @@ public function testBaseControllerActionRoutes() {
                                             <tr>
                             <td>SlimSkeletonMvcApp\Controllers\Hello</td>
                             <td>actionForceHttpFourxxOrFivexx</td>
-                            <td>hello/action-force-http-fourxx-or-fivexx[/http_code=400]</td>
+                            <td>hello/force-http-fourxx-or-fivexx[/http_code=400]</td>
                         </tr>
                                             <tr>
                             <td>SlimSkeletonMvcApp\Controllers\Hello</td>
                             <td>actionIndex</td>
-                            <td>hello/action-index</td>
+                            <td>hello/index</td>
                         </tr>
                                             <tr>
                             <td>SlimSkeletonMvcApp\Controllers\Hello</td>
                             <td>actionThere</td>
-                            <td>hello/action-there/first_name/last_name</td>
+                            <td>hello/there/first_name/last_name</td>
                         </tr>
                                             <tr>
                             <td>SlimSkeletonMvcApp\Controllers\Hello</td>
                             <td>actionWorld</td>
-                            <td>hello/action-world/name/another_param</td>
+                            <td>hello/world/name/another_param</td>
                         </tr>
                                     </tbody>
             </table>