From: John Napiorkowski <jjn1056@yahoo.com>
Date: Mon, 2 Mar 2015 16:43:44 +0000 (-0600)
Subject: Merge branch 'master' into australorp
X-Git-Tag: 5.90089_002~51
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=772bd9deac85d462d77bfe2cbbe73f3de1688ebf;hp=4f04ee56cd0b7d1156d00b7b9771b39a6949002e

Merge branch 'master' into australorp

Conflicts:
	Changes
	lib/Catalyst.pm
	lib/Catalyst/Runtime.pm
---

diff --git a/Changes b/Changes
index db97404..8fd50ce 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+5.90089_001 - TBA
+
 5.90084 - 2015-02-23
   - Small change to the way body parameters are created in order to prevent
     trying to create parameters twice.
@@ -34,6 +36,7 @@
     test case to prevent regressions.
 
 5.90080 - 2015-01-09
+>>>>>>> master
   - Minor documentation corrections
   - Make the '79 development series stable
 
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 92621a1..0d8a817 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -129,7 +129,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 __PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC);
 
 # Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.90084';
+our $VERSION = '5.90089_001';
 $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
 
 sub import {
diff --git a/lib/Catalyst/Runtime.pm b/lib/Catalyst/Runtime.pm
index 09b70c9..cc02f87 100644
--- a/lib/Catalyst/Runtime.pm
+++ b/lib/Catalyst/Runtime.pm
@@ -7,7 +7,7 @@ BEGIN { require 5.008003; }
 
 # Remember to update this in Catalyst as well!
 
-our $VERSION = '5.90084';
+our $VERSION = '5.90089_001';
 $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
 
 =head1 NAME
diff --git a/t/arg_constraints.t b/t/arg_constraints.t
new file mode 100644
index 0000000..bbc312f
--- /dev/null
+++ b/t/arg_constraints.t
@@ -0,0 +1,36 @@
+use warnings;
+use strict;
+use Test::More;
+use HTTP::Request::Common;
+
+{
+  package MyApp::Controller::Root;
+  $INC{'MyApp/Controller/Root.pm'} = __FILE__;
+
+  use Moose;
+  use MooseX::MethodAttributes;
+
+  extends 'Catalyst::Controller';
+
+  sub check :Local {
+    pop->res->from_psgi_response([200, ['Content-Type'=>'text/plain'],['check']]);
+  }
+
+  MyApp::Controller::Root->config(namespace=>'');
+
+  package MyApp;
+  use Catalyst;
+
+  MyApp->setup;
+}
+
+use Catalyst::Test 'MyApp';
+
+{
+  my $res = request '/check';
+  is $res->code, 200, 'OK';
+  is $res->content, 'check', 'correct body';
+  is $res->content_length, 5, 'correct length';
+}
+
+done_testing;