[Catalyst-commits] r11118 - in
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t:
aggregate lib/Catalyst/Plugin/Test lib/TestApp/Controller
yousef at dev.catalyst.perl.org
yousef at dev.catalyst.perl.org
Tue Aug 11 13:47:19 GMT 2009
Author: yousef
Date: 2009-08-11 13:47:18 +0000 (Tue, 11 Aug 2009)
New Revision: 11118
Modified:
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_auto.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_begin.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_chained.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_default.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_detach.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_forward.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_go.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_index.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_visit.t
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/lib/Catalyst/Plugin/Test/Plugin.pm
Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/lib/TestApp/Controller/Root.pm
Log:
Moved end() from Catalyst::Plugin::Test::Plugin to TestApp::Controller::Root. Fixed all the tests that rely on end().
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_auto.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_auto.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_auto.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -35,7 +35,7 @@
TestApp::Controller::Action::Auto->begin
TestApp::Controller::Action::Auto->auto
TestApp::Controller::Action::Auto->one
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -52,7 +52,7 @@
TestApp::Controller::Action::Auto->begin
TestApp::Controller::Action::Auto->auto
TestApp::Controller::Action::Auto->default
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -70,7 +70,7 @@
TestApp::Controller::Action::Auto->auto
TestApp::Controller::Action::Auto::Deep->auto
TestApp::Controller::Action::Auto::Deep->one
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -88,7 +88,7 @@
TestApp::Controller::Action::Auto->auto
TestApp::Controller::Action::Auto::Deep->auto
TestApp::Controller::Action::Auto::Deep->default
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_begin.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_begin.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_begin.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -30,7 +30,7 @@
TestApp::Controller::Action::Begin->begin
TestApp::Controller::Action::Begin->default
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_chained.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_chained.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_chained.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -815,7 +815,7 @@
my @expected = qw[
TestApp::Controller::Action::Chained::Root->rootsub
TestApp::Controller::Action::Chained::Root->endpointsub
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_default.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_default.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_default.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -29,7 +29,7 @@
TestApp::Controller::Action::Default->begin
TestApp::Controller::Action::Default->default
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -76,7 +76,7 @@
my @expected = qw[
TestApp::Controller::Action->begin
TestApp::Controller::Action->default
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_detach.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_detach.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_detach.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -30,7 +30,7 @@
TestApp::Controller::Action::Detach->one
TestApp::Controller::Action::Detach->two
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -57,7 +57,7 @@
TestApp::Controller::Action::Detach->path
TestApp::Controller::Action::Detach->two
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_forward.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_forward.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_forward.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -33,7 +33,7 @@
TestApp::Controller::Action::Forward->four
TestApp::Controller::Action::Forward->five
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -81,7 +81,7 @@
TestApp::Controller::Action::Forward->four
TestApp::Controller::Action::Forward->five
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -156,7 +156,7 @@
TestApp::Controller::Action::Forward->four
TestApp::Controller::Action::Forward->five
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -191,7 +191,7 @@
TestApp::Controller::Action::Forward->four
TestApp::Controller::Action::Forward->five
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_go.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_go.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_go.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -43,7 +43,7 @@
TestApp::Controller::Action::Go->four
TestApp::Controller::Action::Go->five
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
@expected = map { /Action/ ? (_begin($_), $_) : ($_) } @expected;
@@ -74,7 +74,7 @@
my @expected = qw[
TestApp::Controller::Action::Go->go_die
TestApp::Controller::Action::Go->args
- TestApp->end
+ TestApp::Controller::Root->end
];
@expected = map { /Action/ ? (_begin($_), $_) : ($_) } @expected;
@@ -165,7 +165,7 @@
TestApp::Controller::Action::Go->four
TestApp::Controller::Action::Go->five
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
@expected = map { /Action/ ? (_begin($_), $_) : ($_) } @expected;
@@ -200,7 +200,7 @@
TestApp::Controller::Action::Go->four
TestApp::Controller::Action::Go->five
TestApp::View::Dump::Request->process
- TestApp->end
+ TestApp::Controller::Root->end
];
@expected = map { /Action/ ? (_begin($_), $_) : ($_) } @expected;
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_index.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_index.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_index.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -27,8 +27,8 @@
# test root index
{
my @expected = qw[
- TestApp->index
- TestApp->end
+ TestApp::Controller::Root->index
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -45,7 +45,7 @@
{
my @expected = qw[
TestApp::Controller::Index->index
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -66,7 +66,7 @@
my @expected = qw[
TestApp::Controller::Action::Index->begin
TestApp::Controller::Action::Index->index
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
@@ -87,7 +87,7 @@
my @expected = qw[
TestApp::Controller::Action::Index->begin
TestApp::Controller::Action::Index->default
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_visit.t
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_visit.t 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/aggregate/live_component_controller_action_visit.t 2009-08-11 13:47:18 UTC (rev 11118)
@@ -42,11 +42,11 @@
TestApp::Controller::Action::Visit->four
TestApp::Controller::Action::Visit->five
TestApp::View::Dump::Request->process
- TestApp->end
- TestApp->end
- TestApp->end
- TestApp->end
- TestApp->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
];
@expected = map { /Action/ ? (_begin($_), $_) : ($_) } @expected;
@@ -76,8 +76,8 @@
my @expected = qw[
TestApp::Controller::Action::Visit->visit_die
TestApp::Controller::Action::Visit->args
- TestApp->end
- TestApp->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
];
@expected = map { /Action/ ? (_begin($_), $_) : ($_) } @expected;
@@ -166,12 +166,12 @@
TestApp::Controller::Action::Visit->four
TestApp::Controller::Action::Visit->five
TestApp::View::Dump::Request->process
- TestApp->end
- TestApp->end
- TestApp->end
- TestApp->end
- TestApp->end
- TestApp->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
];
@expected = map { /Action/ ? (_begin($_), $_) : ($_) } @expected;
@@ -206,12 +206,12 @@
TestApp::Controller::Action::Visit->four
TestApp::Controller::Action::Visit->five
TestApp::View::Dump::Request->process
- TestApp->end
- TestApp->end
- TestApp->end
- TestApp->end
- TestApp->end
- TestApp->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
+ TestApp::Controller::Root->end
];
@expected = map { /Action/ ? (_begin($_), $_) : ($_) } @expected;
@@ -266,7 +266,7 @@
TestApp::Controller::Action::Chained->foo
TestApp::Controller::Action::Chained::Foo->spoon
TestApp::Controller::Action::Chained->end
- TestApp->end
+ TestApp::Controller::Root->end
];
my $expected = join( ", ", @expected );
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/lib/Catalyst/Plugin/Test/Plugin.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/lib/Catalyst/Plugin/Test/Plugin.pm 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/lib/Catalyst/Plugin/Test/Plugin.pm 2009-08-11 13:47:18 UTC (rev 11118)
@@ -32,8 +32,4 @@
$c->next::method(@_);
}
-sub end : Private {
- my ($self,$c) = @_;
-}
-
1;
Modified: Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/lib/TestApp/Controller/Root.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/lib/TestApp/Controller/Root.pm 2009-08-10 22:53:43 UTC (rev 11117)
+++ Catalyst-Runtime/5.80/branches/deprecate_appclass_actions/t/lib/TestApp/Controller/Root.pm 2009-08-11 13:47:18 UTC (rev 11118)
@@ -48,4 +48,8 @@
$c->forward( 'recursion_test' );
}
+sub end : Private {
+ my ($self,$c) = @_;
+}
+
1;
More information about the Catalyst-commits
mailing list