X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Flive_component_controller_action_chained.t;h=efea301b4bc566d7454d97e6de1d41fe1c0e410e;hb=665a72a25c7bc0d928ea0924f3023d3e14c302d1;hp=b0af1560b17c61744718394e19381704559fe86b;hpb=7b346bc3db27269e9a236ecb71806451a7613fdd;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/live_component_controller_action_chained.t b/t/aggregate/live_component_controller_action_chained.t
index b0af156..efea301 100644
--- a/t/aggregate/live_component_controller_action_chained.t
+++ b/t/aggregate/live_component_controller_action_chained.t
@@ -847,6 +847,30 @@ sub run_tests {
     }
 
     #
+    #   Complex path with multiple non-capturing pathparts
+    # PathPart('') CaptureArgs(0), PathPart('foo') CaptureArgs(0), PathPart('') Args(0)
+    # should win over PathPart('') CaptureArgs(1), PathPart('') Args(0)
+    #
+    {
+        my @expected = qw[
+          TestApp::Controller::Action::Chained->begin
+          TestApp::Controller::Action::Chained->mult_nopp2_base
+          TestApp::Controller::Action::Chained->mult_nopp2_nocap
+          TestApp::Controller::Action::Chained->mult_nopp2_action
+          TestApp::Controller::Action::Chained->mult_nopp2_action_default
+          TestApp::Controller::Action::Chained->end
+        ];
+
+        my $expected = join( ", ", @expected );
+
+        ok( my $response = request('http://localhost/chained/mult_nopp2/action'),
+            "Complex path with multiple non-capturing pathparts" );
+        is( $response->header('X-Catalyst-Executed'),
+            $expected, 'Executed actions' );
+        is( $response->content, '; ', 'Content OK' );
+    }
+
+    #
     #   Higher Args() hiding more specific CaptureArgs chains sections
     #
     {
@@ -1087,7 +1111,7 @@ sub run_tests {
         # Just check that the path matches, as who the hell knows or cares
         # where the app is based (live tests etc)
         ok( index($content, $path) > 1, 'uri can round trip through uri_for' )
-            or diag "'$content' does not contain '$path'";
+            or diag("Expected $path, got $content");
     }
 }