X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Fcontent_negotiation.t;h=559a370ca077d2e9af918aa5cb36bb51d89174e4;hp=df6a3c560e6b6b2bc65bf911079a4485d52abb3a;hb=1ecc166cbe5d6d95980cf49d1e7d8ac8c21da949;hpb=d15db19cbcfd1896251aa7704907fb76b552beb7

diff --git a/t/content_negotiation.t b/t/content_negotiation.t
index df6a3c5..559a370 100644
--- a/t/content_negotiation.t
+++ b/t/content_negotiation.t
@@ -18,14 +18,14 @@ use Catalyst::Test 'TestContentNegotiation';
 
   ok my $res = request $req;
 
-  is $res->content, 'is_json';
+  is $res->content, 'is_json1';
 }
 
 {
   ok my $req = POST '/', [a=>1,b=>2];
   ok my $res = request $req;
 
-  is $res->content, 'is_urlencoded';
+  is $res->content, 'is_urlencoded1';
 }
 
 {
@@ -36,8 +36,95 @@ use Catalyst::Test 'TestContentNegotiation';
 
   ok my $res = request $req;
 
-  is $res->content, 'is_multipart';
+  is $res->content, 'is_multipart1';
 }
 
+{
+  ok my $req = POST '/under',
+     Content_Type => 'application/json',
+     Content => encode_json +{message=>'test'};
+
+  ok my $res = request $req;
+
+  is $res->content, 'is_json2';
+}
+
+{
+  ok my $req = POST '/under', [a=>1,b=>2];
+  ok my $res = request $req;
+
+  is $res->content, 'is_urlencoded2';
+}
+
+{
+  ok my $path = TestContentNegotiation->path_to(qw/share file.txt/);
+  ok my $req = POST '/under',
+    Content_Type => 'form-data',
+    Content =>  [a=>1, b=>2, file=>["$path"]];
+
+  ok my $res = request $req;
+
+  is $res->content, 'is_multipart2';
+}
+
+{
+  ok my $req = POST '/is_more_than_one_1',
+    Content =>  [a=>1, b=>2];
+
+  ok my $res = request $req;
+
+  is $res->content, 'formdata1';
+}
+
+{
+  ok my $req = POST '/is_more_than_one_2',
+    Content =>  [a=>1, b=>2];
+
+  ok my $res = request $req;
+
+  is $res->content, 'formdata2';
+}
+
+{
+  ok my $req = POST '/is_more_than_one_3',
+    Content =>  [a=>1, b=>2];
+
+  ok my $res = request $req;
+
+  is $res->content, 'formdata3';
+}
+
+{
+  ok my $path = TestContentNegotiation->path_to(qw/share file.txt/);
+  ok my $req = POST '/is_more_than_one_1',
+    Content_Type => 'form-data',
+    Content =>  [a=>1, b=>2, file=>["$path"]];
+
+  ok my $res = request $req;
+
+  is $res->content, 'formdata1';
+}
+
+{
+  ok my $path = TestContentNegotiation->path_to(qw/share file.txt/);
+  ok my $req = POST '/is_more_than_one_2',
+    Content_Type => 'form-data',
+    Content =>  [a=>1, b=>2, file=>["$path"]];
+
+  ok my $res = request $req;
+
+  is $res->content, 'formdata2';
+}
+
+{
+  ok my $path = TestContentNegotiation->path_to(qw/share file.txt/);
+  ok my $req = POST '/is_more_than_one_3',
+    Content_Type => 'form-data',
+    Content =>  [a=>1, b=>2, file=>["$path"]];
+
+  ok my $res = request $req;
+
+  is $res->content, 'formdata3';
+}
 
 done_testing;