Fix test skipping of http tests

[catagits/Catalyst-Runtime.git] / t / optional_http-server.t

diff --git a/t/optional_http-server.t b/t/optional_http-server.t
index d03a107..4b69d80 100644 (file)
--- a/t/optional_http-server.t
+++ b/t/optional_http-server.t
@@ -7,9 +7,11 @@ use File::Path;
 use FindBin;
 use IO::Socket;
 use Test::More;
-eval "use File::Copy::Recursive";
 
 plan skip_all => 'set TEST_HTTP to enable this test' unless $ENV{TEST_HTTP};
+eval "use Catalyst::Devel 1.0";
+plan skip_all => 'Catalyst::Devel required' if $@;
+eval "use File::Copy::Recursive";
 plan skip_all => 'File::Copy::Recursive required' if $@;
 plan tests => 1;
 
@@ -20,7 +22,7 @@ rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 mkdir "$FindBin::Bin/../t/tmp";
 chdir "$FindBin::Bin/../t/tmp";
 system "perl -I$FindBin::Bin/../lib $FindBin::Bin/../script/catalyst.pl TestApp";
-chdir "$FindBin::Bin/../..";
+chdir "$FindBin::Bin/..";
 File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
 
 # remove TestApp's tests