X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Funit_utils_subdir.t;h=8a7865582faec1ea6dac8eb95605607d90aa533e;hp=d35cac001e01223c5822da363c3f7391b342028a;hb=4c71cf1b43594eabfee6e346a0a30b6dcf315b4f;hpb=19bcd236b4de80c47e1f576385359d70701613e8 diff --git a/t/unit_utils_subdir.t b/t/unit_utils_subdir.t index d35cac0..8a78655 100644 --- a/t/unit_utils_subdir.t +++ b/t/unit_utils_subdir.t @@ -4,30 +4,31 @@ use strict; use warnings; # simulates an entire testapp rooted at t/something -# except without bothering creating it since its +# except without bothering creating it since it's # only the -e check on the Makefile.PL that matters BEGIN { use_ok 'Catalyst::Utils' } use FindBin; +use Path::Class::Dir; { $INC{'TestApp.pm'} = "$FindBin::Bin/something/script/foo/../../lib/TestApp.pm"; my $home = Catalyst::Utils::home('TestApp'); - like($home, qr{t[\/\\]something}, "has path TestApp/t/something"); + like($home, qr{t[\/\\]something}, "has path TestApp/t/something"); unlike($home, qr{[\/\\]script[\/\\]foo}, "doesn't have path /script/foo"); } { $INC{'TestApp.pm'} = "$FindBin::Bin/something/script/foo/bar/../../../lib/TestApp.pm"; my $home = Catalyst::Utils::home('TestApp'); - like($home, qr{t[\/\\]something}, "has path TestApp/t/something"); + like($home, qr{t[\/\\]something}, "has path TestApp/t/something"); unlike($home, qr{[\/\\]script[\/\\]foo[\/\\]bar}, "doesn't have path /script/foo/bar"); } { $INC{'TestApp.pm'} = "$FindBin::Bin/something/script/../lib/TestApp.pm"; my $home = Catalyst::Utils::home('TestApp'); - like($home, qr{t[\/\\]something}, "has path TestApp/t/something"); + like($home, qr{t[\/\\]something}, "has path TestApp/t/something"); unlike($home, qr{[\/\\]script[\/\\]foo}, "doesn't have path /script/foo"); } @@ -35,8 +36,9 @@ use FindBin; $INC{'TestApp.pm'} = "TestApp.pm"; my $dir = "$FindBin::Bin/something"; chdir( $dir ); - + my $home = Catalyst::Utils::home('TestApp'); - is( $home, $dir, 'same dir loading' ); + $dir = Path::Class::Dir->new( $dir ); + is( $home, "$dir", 'same dir loading' ); }