Test for r11331 + fix to only report each action name once from get_action_methods

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Controller.pm

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index cb01c11..d52ae3f 100644 (file)
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -187,20 +187,23 @@ sub get_action_methods {
           . $meta->name
           . " cannot support register_actions." )
       unless $meta->can('get_nearest_methods_with_attributes');
-    my @methods = $meta->get_nearest_methods_with_attributes;
 
-    # actions specified via config are also action_methods
-    push(
-        @methods,
-        map {
+    # Find (and de-dup) action methods from attributes and those from config.
+    my %methods = (
+        map({ $_->name => 1 } $meta->get_nearest_methods_with_attributes),
+        %{ $self->_controller_actions }
+    );
+
+    if (ref $self) {
+        foreach (keys %methods) {
             $meta->find_method_by_name($_)
               || confess( 'Action "'
                   . $_
                   . '" is not available from controller '
-                  . ( ref $self ) )
-          } keys %{ $self->_controller_actions }
-    ) if ( ref $self );
-    return @methods;
+                  . ( ref $self ) );
+        }
+    }
+    return keys %methods;
 }