X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcatalyst-request-rest.t;h=ac49e29cddeb77d43df52ac223390b3f0c9f8bb5;hb=546f2871596e4ee5b305891b254170f45eb49629;hp=44938973b27b31e62c689b8bfb7c322bedfa6c4b;hpb=d6fb033c1dbd94c0d527ec53291af2c50a482e9d;p=catagits%2FCatalyst-Action-Serialize-Data-Serializer.git

diff --git a/t/catalyst-request-rest.t b/t/catalyst-request-rest.t
index 4493897..ac49e29 100644
--- a/t/catalyst-request-rest.t
+++ b/t/catalyst-request-rest.t
@@ -1,8 +1,8 @@
 use strict;
 use warnings;
-use Test::More tests => 24;
+use Test::More tests => 28;
 use FindBin;
-use lib ( "$FindBin::Bin/../lib" );
+use lib ( "$FindBin::Bin/../lib", "$FindBin::Bin/../t/lib" );
 
 use Catalyst::Request::REST;
 use HTTP::Headers;
@@ -87,7 +87,7 @@ use HTTP::Headers;
     $request->headers( HTTP::Headers->new );
     $request->parameters( {} );
     $request->method('GET');
-    $request->content_type('text/x-json');
+    $request->content_type('application/json');
     $request->headers->header(
         'Accept' =>
         # From Firefox 2.0 when it requests an html page
@@ -95,7 +95,7 @@ use HTTP::Headers;
     );
 
     is_deeply( $request->accepted_content_types,
-               [ qw( text/x-json
+               [ qw( application/json
                      text/xml application/xml application/xhtml+xml
                      image/png
                      text/html
@@ -167,6 +167,25 @@ use HTTP::Headers;
                'each type appears only once' );
 }
 
+{
+  my $test = 'Test::Catalyst::Action::REST';
+  use_ok $test;
+  is($test->request_class, 'Catalyst::Request::REST',
+    'Request::REST took over for Request');
+
+  $test->request_class('Some::Other::Class');
+  eval { $test->setup_finished(0); $test->setup };
+  like $@, qr/$test has a custom request class Some::Other::Class/;
+
+  {
+    package My::Request;
+    use base 'Catalyst::Request::REST';
+  }
+  $test->request_class('My::Request');
+  eval { $test->setup_finished(0); $test->setup };
+  is $@, '', 'no error from Request::REST subclass';
+}
+
 package MockContext;
 
 sub prepare_body { }