1 files changed, 12 insertions, 11 deletions

diff --git a/t/21-app-dthumb.files.t b/t/21-app-dthumb.files.t
index 7c91580..60283a6 100755
--- a/t/21-app-dthumb.files.t
+++ b/t/21-app-dthumb.files.t
@@ -14,8 +14,8 @@ plan tests => 9;
 use_ok('App::Dthumb');
 
 my %conf = (
-	file_index => 't/out/index',
-	dir_images => 't/imgdir',
+	file_index => 'index',
+	dir_images => 't/out',
 );
 my @created_files;
 my @indep_files = ('main.css');
@@ -23,10 +23,10 @@ my @indep_files = ('main.css');
 my $dthumb = App::Dthumb->new(%conf);
 isa_ok($dthumb, 'App::Dthumb');
 
-mkdir('t/out');
+$dthumb->read_directories;
 
 for my $file (qw(one.png two.png)) {
-	$dthumb->create_thumbnail_html($file);
+	$dthumb->create_thumbnail_html("t/out/$file");
 }
 $dthumb->write_out_html();
 
@@ -40,8 +40,10 @@ unlink('t/out/index');
 $conf{names} = 0;
 $dthumb = App::Dthumb->new(%conf);
 
+$dthumb->read_directories;
+
 for my $file (qw(one.png two.png)) {
-	$dthumb->create_thumbnail_html($file);
+	$dthumb->create_thumbnail_html("t/out/$file");
 }
 $dthumb->write_out_html();
 
@@ -53,9 +55,10 @@ unlink('t/out/index');
 
 
 $dthumb = App::Dthumb->new(dir_images => 't/out');
-$dthumb->create_files();
+$dthumb->read_directories;
+$dthumb->create_files;
 
-ok(-d 't/out/.thumbs', 'create_files: Creates thumb dir');
+ok(-d 't/out/.thumbnails', 'create_files: Creates thumb dir');
 ok(-d 't/out/.dthumb', 'create_files: Creates data dir');
 
 for my $file ($dthumb->{data}->list_archived()) {
@@ -64,11 +67,9 @@ for my $file ($dthumb->{data}->list_archived()) {
 		unlink("t/out/.dthumb/${file}");
 	}
 }
-rmdir('t/out/.thumbs');
 rmdir('t/out/.dthumb/css');
 rmdir('t/out/.dthumb/js');
 rmdir('t/out/.dthumb');
-rmdir('t/out');
 
 is_deeply([sort $dthumb->{data}->list_archived()], [sort @created_files],
 	'create_files: All files created');
@@ -78,5 +79,5 @@ $dthumb = App::Dthumb->new(%conf);
 
 $dthumb->read_directories();
 
-is_deeply($dthumb->{old_thumbnails}, ['invalid.png'], '{old_thumbnails}');
-is_deeply($dthumb->{files}, ['one.png', 'two.png'], '{files}');
+is_deeply($dthumb->{old_thumbnails}, ['t/out/invalid.png'], '{old_thumbnails}');
+is_deeply($dthumb->{files}, ['t/out/one.png', 't/out/two.png'], '{files}');