merged conflicts

[catagits/Catalyst-Runtime.git] / t / aggregate / unit_core_action_for.t

diff --git a/t/aggregate/unit_core_action_for.t b/t/aggregate/unit_core_action_for.t
index 3e75eaa..b3f0088 100644 (file)
--- a/t/aggregate/unit_core_action_for.t
+++ b/t/aggregate/unit_core_action_for.t
@@ -1,5 +1,3 @@
-#!perl
-
 use strict;
 use warnings;
 
@@ -12,7 +10,7 @@ plan tests => 4;
 
 use_ok('TestApp');
 
-is(TestApp->action_for('global_action')->code, TestApp->can('global_action'),
+is(TestApp->action_for('global_action')->code, TestApp::Controller::Root->can('global_action'),
    'action_for on appclass ok');
 
 is(TestApp->controller('Args')->action_for('args')->code,