From: Graham Knop <haarg@haarg.org>
Date: Mon, 13 Feb 2017 05:50:39 +0000 (-0500)
Subject: stop using Moo as a test package
X-Git-Tag: 5.90116~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=82010ea176741c7a4f2baf3f6f27377b1d9f6b15

stop using Moo as a test package

Moo is a real module, and may be in our prerequisite list.  Stepping on
its namespace is confusing and could easily cause issues.
---

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index fbab60f..466d4d9 100644
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -862,9 +862,9 @@ The following is exactly the same:
 
     package MyApp::Controller::Zoo;
 
-    sub foo  : Local Does('Moo')  { ... } # Catalyst::ActionRole::
-    sub bar  : Local Does('~Moo') { ... } # MyApp::ActionRole::Moo
-    sub baz  : Local Does('+MyApp::ActionRole::Moo') { ... }
+    sub foo  : Local Does('Buzz')  { ... } # Catalyst::ActionRole::
+    sub bar  : Local Does('~Buzz') { ... } # MyApp::ActionRole::Buzz
+    sub baz  : Local Does('+MyApp::ActionRole::Buzz') { ... }
 
 =head2 GET
 
diff --git a/lib/Catalyst/DispatchType/Chained.pm b/lib/Catalyst/DispatchType/Chained.pm
index 2eb0bc1..138727c 100644
--- a/lib/Catalyst/DispatchType/Chained.pm
+++ b/lib/Catalyst/DispatchType/Chained.pm
@@ -702,7 +702,7 @@ controller. For Example:
   # in MyApp::Controller::Foo
   sub bar : Chained CaptureArgs(1) { ... }
 
-  # in MyApp::Controller::Foo::Moo
+  # in MyApp::Controller::Foo::Bar
   sub bar : ChainedParent Args(1) { ... }
 
 This builds a chain like C</bar/*/bar/*>.
diff --git a/t/aggregate/live_component_controller_actionroles.t b/t/aggregate/live_component_controller_actionroles.t
index 0bf1b0c..a78fbec 100644
--- a/t/aggregate/live_component_controller_actionroles.t
+++ b/t/aggregate/live_component_controller_actionroles.t
@@ -8,9 +8,9 @@ use lib "$FindBin::Bin/../lib";
 use Catalyst::Test 'TestApp';
 
 my %roles = (
-    foo  => 'TestApp::ActionRole::Moo',
-    bar  => 'TestApp::ActionRole::Moo',
-    baz  => 'Moo',
+    foo  => 'TestApp::ActionRole::Guff',
+    bar  => 'TestApp::ActionRole::Guff',
+    baz  => 'Guff',
     quux => 'Catalyst::ActionRole::Zoo',
 );
 
@@ -24,9 +24,9 @@ while (my ($path, $role) = each %roles) {
 {
     my $resp = request("/actionroles/corge");
     ok($resp->is_success);
-    is($resp->content, 'TestApp::ActionRole::Moo');
+    is($resp->content, 'TestApp::ActionRole::Guff');
     is($resp->header('X-Affe'), 'Tiger');
-   is($resp->header('X-Action-After'), 'moo');
+    is($resp->header('X-Action-After'), 'moo');
 }
 {
     my $resp = request("/actionroles/frew");
diff --git a/t/lib/Catalyst/ActionRole/Moo.pm b/t/lib/Catalyst/ActionRole/Guff.pm
similarity index 80%
rename from t/lib/Catalyst/ActionRole/Moo.pm
rename to t/lib/Catalyst/ActionRole/Guff.pm
index 3d4aa51..4f8e046 100644
--- a/t/lib/Catalyst/ActionRole/Moo.pm
+++ b/t/lib/Catalyst/ActionRole/Guff.pm
@@ -1,4 +1,4 @@
-package Catalyst::ActionRole::Moo;
+package Catalyst::ActionRole::Guff;
 
 use Moose::Role;
 
diff --git a/t/lib/Moo.pm b/t/lib/Guff.pm
similarity index 91%
rename from t/lib/Moo.pm
rename to t/lib/Guff.pm
index c28806a..16e558e 100644
--- a/t/lib/Moo.pm
+++ b/t/lib/Guff.pm
@@ -1,4 +1,4 @@
-package Moo;
+package Guff;
 
 use Moose::Role;
 
diff --git a/t/lib/TestApp/ActionRole/Moo.pm b/t/lib/TestApp/ActionRole/Guff.pm
similarity index 77%
rename from t/lib/TestApp/ActionRole/Moo.pm
rename to t/lib/TestApp/ActionRole/Guff.pm
index d0fd290..3e8fdd9 100644
--- a/t/lib/TestApp/ActionRole/Moo.pm
+++ b/t/lib/TestApp/ActionRole/Guff.pm
@@ -1,4 +1,4 @@
-package TestApp::ActionRole::Moo;
+package TestApp::ActionRole::Guff;
 
 use Moose::Role;
 
diff --git a/t/lib/TestApp/Controller/ActionRoles.pm b/t/lib/TestApp/Controller/ActionRoles.pm
index 37c24f9..69206bb 100644
--- a/t/lib/TestApp/Controller/ActionRoles.pm
+++ b/t/lib/TestApp/Controller/ActionRoles.pm
@@ -11,12 +11,12 @@ __PACKAGE__->config(
     },
 );
 
-sub foo  : Local Does('Moo')  {}
-sub bar  : Local Does('~Moo') {}
-sub baz  : Local Does('+Moo') {}
+sub foo  : Local Does('Guff')  {}
+sub bar  : Local Does('~Guff') {}
+sub baz  : Local Does('+Guff') {}
 sub quux : Local Does('Zoo')  {}
 
-sub corge : Local Does('Moo') ActionClass('TestAfter') {
+sub corge : Local Does('Guff') ActionClass('TestAfter') {
     my ($self, $ctx) = @_;
     $ctx->stash(after_message => 'moo');
 }