From: Tomas Doran <bobtfish@bobtfish.net>
Date: Wed, 29 Feb 2012 00:05:24 +0000 (+0000)
Subject: Fix for tests
X-Git-Tag: 5.90011~8
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=b9b257cc297aa70b53e13d3dde802705965afe0a

Fix for tests
---

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index 95eedc4..6ba6f86 100644
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -207,7 +207,7 @@ sub home {
 
 =head2 find_home_unloaded_in_checkout ($path)
 
-Tries to determine if C<$path> (or cwd if not supplied)
+Tries to determine if C<$path> (or the current working directory if not supplied)
 looks like a checkout. Any leading lib, script or blib components
 will be removed, then the directory produced will be checked
 for the existence of a C<< dist_indicator_file_list() >>.
@@ -216,12 +216,12 @@ If one is found, the directory will be returned, otherwise false.
 
 =cut
 
+# XXX - Is this actually sane - should we just split into two simpler routines
+#       one for when we do have an @INC entry and one for when we don't?
 sub find_home_unloaded_in_checkout {
     my ($path) = @_;
     $path ||= cwd() if !defined $path || !length $path;
     my $home = dir($path)->absolute->cleanup;
-    # pop off /lib and /blib if they're there
-    # pop off /script if it's there.
     my $last_home;
     do {
         # only return the dir if it has a Makefile.PL or Build.PL or dist.ini
diff --git a/t/lib/TestAppEncoding/Controller/Root.pm b/t/lib/TestAppEncoding/Controller/Root.pm
index a8987fb..64caa28 100644
--- a/t/lib/TestAppEncoding/Controller/Root.pm
+++ b/t/lib/TestAppEncoding/Controller/Root.pm
@@ -8,8 +8,8 @@ __PACKAGE__->config->{namespace} = '';
 
 sub binary : Local {
     my ($self, $c) = @_;
-    $c->res->body(do { 
-        open(my $fh, '<', $c->path_to('..', '..', 'catalyst_130pix.gif')) or die $!; 
+    $c->res->body(do {
+        open(my $fh, '<', $c->path_to('..', 'catalyst_130pix.gif')) or die $!; 
         binmode($fh); 
         local $/ = undef; <$fh>;
     });