Fix Chained dispatch for several first-come first-served bugs when comparing Args...

[catagits/Catalyst-Runtime.git] / t / live_component_controller_action_chained.t

diff --git a/t/live_component_controller_action_chained.t b/t/live_component_controller_action_chained.t
index 9fcdc48..411542e 100644 (file)
--- a/t/live_component_controller_action_chained.t
+++ b/t/live_component_controller_action_chained.t
@@ -10,7 +10,7 @@ our $iters;
 
 BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
 
-use Test::More tests => 112*$iters;
+use Test::More tests => 118*$iters;
 use Catalyst::Test 'TestApp';
 
 if ( $ENV{CAT_BENCHMARK} ) {
@@ -766,22 +766,66 @@ sub run_tests {
         is( $response->content, '; ', 'Content OK' );
     }
 
-    #
-    #   PathPrefix
-    #
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Chained->begin
-          TestApp::Controller::Action::Chained::PathPrefix->instance
-          TestApp::Controller::Action::Chained->end
-        ];
-
-        my $expected = join( ", ", @expected );
+       #
+       #       Higher Args() hiding more specific CaptureArgs chains sections
+       #
+       {
+               my @expected = qw[
+                       TestApp::Controller::Action::Chained->begin
+                       TestApp::Controller::Action::Chained->cc_base
+                       TestApp::Controller::Action::Chained->cc_link
+                       TestApp::Controller::Action::Chained->cc_anchor
+                       TestApp::Controller::Action::Chained->end
+                       ];
+
+               my $expected = join ', ', @expected;
+
+               ok( my $response = request('http://localhost/chained/choose_capture/anchor.html'),
+                       'Choose between an early Args() and a later more ideal chain' );
+               is( $response->header('X-Catalyst-Executed') => $expected, 'Executed actions');
+               is( $response->content => '; ', 'Content OK' );
+       }
+
+       #
+       #       Less specific chain not being seen correctly due to earlier looser capture
+       #
+       {
+               my @expected = qw[
+                       TestApp::Controller::Action::Chained->begin
+                       TestApp::Controller::Action::Chained->cc_base
+                       TestApp::Controller::Action::Chained->cc_b
+                       TestApp::Controller::Action::Chained->cc_b_link
+                       TestApp::Controller::Action::Chained->cc_b_anchor
+                       TestApp::Controller::Action::Chained->end
+                       ];
+
+               my $expected = join ', ', @expected;
+
+               ok( my $response = request('http://localhost/chained/choose_capture/b/a/anchor.html'),
+                       'Choose between a more specific chain and an earlier looser one' );
+               is( $response->header('X-Catalyst-Executed') => $expected, 'Executed actions');
+               is( $response->content => 'a; ', 'Content OK' );
+       }
+
+       #
+       #       Check we get the looser one when it's the correct match
+       #
+       {
+               my @expected = qw[
+                       TestApp::Controller::Action::Chained->begin
+                       TestApp::Controller::Action::Chained->cc_base
+                       TestApp::Controller::Action::Chained->cc_a
+                       TestApp::Controller::Action::Chained->cc_a_link
+                       TestApp::Controller::Action::Chained->cc_a_anchor
+                       TestApp::Controller::Action::Chained->end
+                       ];
+
+               my $expected = join ', ', @expected;
+
+               ok( my $response = request('http://localhost/chained/choose_capture/a/a/anchor.html'),
+                       'Choose between a more specific chain and an earlier looser one' );
+               is( $response->header('X-Catalyst-Executed') => $expected, 'Executed actions');
+               is( $response->content => 'a; anchor.html', 'Content OK' );
+       }
 
-        ok( my $response = request('http://localhost/action/chained/pathprefix/1'),
-            "PathPrefix (as an endpoint)" );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-        is( $response->content, '; 1', 'Content OK' );
-    }
 }