fixed small bug in Mojo::Asset::File and improved tests

mojolicious · Jul 16, 2012 · bb2661c · bb2661c
1 parent 050a25c
commit bb2661c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,8 @@
 
+3.10  2012-07-17
+  - Improved tests.
+  - Fixed small bug in Mojo::Asset::File.
+
 3.09  2012-07-16
   - Added spurt function to Mojo::Util.
   - Added spurt method to Mojo::ByteStream.

diff --git a/lib/Mojo/Asset/File.pm b/lib/Mojo/Asset/File.pm
@@ -120,7 +120,8 @@ sub move_to {
   my ($self, $to) = @_;
 
   # Windows requires that the handle is closed
-  close delete $self->{handle};
+  close $self->handle;
+  delete $self->{handle};
 
   # Move file and prevent clean up
   my $from = $self->path;

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -34,7 +34,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Rainbow';
-our $VERSION  = '3.09';
+our $VERSION  = '3.10';
 
 # "These old doomsday devices are dangerously unstable.
 #  I'll rest easier not knowing where they are."

diff --git a/t/mojo/asset.t b/t/mojo/asset.t
@@ -1,6 +1,6 @@
 use Mojo::Base -strict;
 
-use Test::More tests => 63;
+use Test::More tests => 69;
 
 # "And now, in the spirit of the season: start shopping.
 #  And for every dollar of Krusty merchandise you buy,
@@ -114,6 +114,10 @@ is $mem->move_to($path)->slurp, 'abc', 'right content';
 ok -e $path, 'file exists';
 unlink $path;
 ok !-e $path, 'file has been cleaned up';
+is(Mojo::Asset::Memory->new->move_to($path)->slurp, '', 'no content');
+ok -e $path, 'file exists';
+unlink $path;
+ok !-e $path, 'file has been cleaned up';
 
 # Move file asset to file
 $file = Mojo::Asset::File->new;
@@ -129,6 +133,10 @@ undef $file;
 ok -e $path, 'file exists';
 unlink $path;
 ok !-e $path, 'file has been cleaned up';
+is(Mojo::Asset::File->new->move_to($path)->slurp, '', 'no content');
+ok -e $path, 'file exists';
+unlink $path;
+ok !-e $path, 'file has been cleaned up';
 
 # Upgrade
 my $asset = Mojo::Asset::Memory->new(max_memory_size => 5, auto_upgrade => 1);