normalize paths for comparison

mojolicious · Feb 25, 2016 · d20f2a4 · d20f2a4
1 parent 21c34d8
commit d20f2a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
 6.49  2016-02-25
+  - Fixed Windows bug in "util.t".
 
 6.48  2016-02-24
   - Added files function to Mojo::Util.

diff --git a/lib/Mojo/Server/Morbo.pm b/lib/Mojo/Server/Morbo.pm
@@ -14,7 +14,7 @@ has watch  => sub { [qw(lib templates)] };
 sub check {
   my $self = shift;
   $self->_check($_) and return $_
-    for map { -f $_ && -r $_ ? $_ : files $_ } @{$self->watch};
+    for map { -f $_ && -r _ ? $_ : files $_ } @{$self->watch};
   return undef;
 }
 

diff --git a/t/mojo/util.t b/t/mojo/util.t
@@ -5,7 +5,7 @@ use lib "$FindBin::Bin/lib";
 
 use Test::More;
 use File::Basename 'dirname';
-use File::Spec::Functions qw(catdir catfile);
+use File::Spec::Functions qw(catdir catfile splitdir);
 use File::Temp 'tempdir';
 use Mojo::ByteStream 'b';
 use Mojo::DeprecationTest;
@@ -422,7 +422,7 @@ my @files = map { catfile $lib, split '/' } (
   'LoaderTest/A.pm',    'LoaderTest/B.pm',
   'LoaderTest/C.pm'
 );
-is_deeply [files $lib], \@files, 'right files';
+is_deeply [map { catfile splitdir $_ } files $lib], \@files, 'right files';
 
 # steady_time
 like steady_time, qr/^[\d.]+$/, 'high resolution time';