From: Tomas Doran <bobtfish@bobtfish.net>
Date: Wed, 4 Mar 2009 16:53:02 +0000 (+0000)
Subject: FAILCAKE, I only meant to TODO
X-Git-Tag: 5.80001~66
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=f2572e6343dd360c954925bce0c01c03f0adf365

FAILCAKE, I only meant to TODO
---

diff --git a/t/aggregate/live_component_controller_action_inheritance.t b/t/aggregate/live_component_controller_action_inheritance.t
index 4a434e0..c58866b 100644
--- a/t/aggregate/live_component_controller_action_inheritance.t
+++ b/t/aggregate/live_component_controller_action_inheritance.t
@@ -10,7 +10,7 @@ our $iters;
 
 BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
 
-use Test::More tests => 26*$iters;
+use Test::More tests => 21*$iters;
 use Catalyst::Test 'TestApp';
 
 if ( $ENV{CAT_BENCHMARK} ) {
@@ -116,26 +116,4 @@ sub run_tests {
             'Content is a serialized Catalyst::Request'
         );
     }
-
-    {
-        my @expected = qw[
-          TestApp::Controller::Action::Inheritance->begin
-          TestApp::Controller::Action::Inheritance->auto
-          TestApp::Controller::Action::Inheritance::Chained->chain_root
-          TestApp::Controller::Action::Inheritance::Chained->chain_first
-          TestApp::Controller::Action::Inheritance::Chained->chain_middle
-          TestApp::Controller::Action::Inheritance::Chained->chain_end
-          TestApp::Controller::Action::Inheritance->end
-        ];
-
-        my $expected = join( ", ", @expected );
-
-        ok( my $response = request('http://localhost/action/inheritance/chained/chain_end'),
-            'Request' );
-        ok( $response->is_success, 'Response Successful 2xx' );
-        is( $response->content_type, 'text/plain', 'Response Content-Type' );
-        is( $response->header('X-Catalyst-Action'), '/action/inheritance/chained/chain_end', 'Test Action' );
-        is( $response->header('X-Catalyst-Executed'),
-            $expected, 'Executed actions' );
-    }
 }
diff --git a/t/lib/TestApp/Controller/Action/Inheritance.pm b/t/lib/TestApp/Controller/Action/Inheritance.pm
index bed68e4..6eae935 100644
--- a/t/lib/TestApp/Controller/Action/Inheritance.pm
+++ b/t/lib/TestApp/Controller/Action/Inheritance.pm
@@ -70,13 +70,5 @@ sub end : Private {
     my ( $self, $c ) = @_;
 }
 
-package TestApp::Controller::Action::Inheritance::Chained;
-
-use strict;
-use base qw/TestApp::ControllerBase::Middle TestApp::ControllerBase::RealMiddle/;
-
-sub chain_first : CaptureArgs(0) PathPart('') Chained('chain_root') {}
-
-
 1;
 
diff --git a/t/lib/TestApp/ControllerBase/Middle.pm b/t/lib/TestApp/ControllerBase/Middle.pm
deleted file mode 100644
index 38a4a74..0000000
--- a/t/lib/TestApp/ControllerBase/Middle.pm
+++ /dev/null
@@ -1,11 +0,0 @@
-package TestApp::ControllerBase::Middle;
-
-use Moose;
-
-use namespace::clean -except => 'meta';
-
-BEGIN { extends qw/TestApp::ControllerBase::Root/; }
-
-__PACKAGE__->meta->make_immutable;
-
-1;
diff --git a/t/lib/TestApp/ControllerBase/OtherRoot.pm b/t/lib/TestApp/ControllerBase/OtherRoot.pm
deleted file mode 100644
index 0c2c51f..0000000
--- a/t/lib/TestApp/ControllerBase/OtherRoot.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package TestApp::ControllerBase::OtherRoot;
-
-use Moose;
-
-use namespace::clean -except => 'meta';
-
-BEGIN { extends qw/Catalyst::Controller/; }
-
-sub chain_middle : CaptureArgs(0) PathPart('') Chained('chain_first') {}
-
-__PACKAGE__->meta->make_immutable;
-
-1;
diff --git a/t/lib/TestApp/ControllerBase/RealMiddle.pm b/t/lib/TestApp/ControllerBase/RealMiddle.pm
deleted file mode 100644
index 790a07d..0000000
--- a/t/lib/TestApp/ControllerBase/RealMiddle.pm
+++ /dev/null
@@ -1,11 +0,0 @@
-package TestApp::ControllerBase::RealMiddle;
-
-use Moose;
-
-use namespace::clean -except => 'meta';
-
-BEGIN { extends qw/TestApp::ControllerBase::OtherRoot/; }
-
-__PACKAGE__->meta->make_immutable;
-
-1;
diff --git a/t/lib/TestApp/ControllerBase/Root.pm b/t/lib/TestApp/ControllerBase/Root.pm
deleted file mode 100644
index 9f1b094..0000000
--- a/t/lib/TestApp/ControllerBase/Root.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package TestApp::ControllerBase::Root;
-
-use Moose;
-
-use namespace::clean -except => 'meta';
-
-BEGIN { extends qw/Catalyst::Controller/; }
-
-sub chain_root : Chained('/') PathPrefix CaptureArgs(0) {}
-
-sub chain_end : Chained('chain_middle') Args(0) {}
-
-__PACKAGE__->meta->make_immutable;
-
-1;