From 1af791ab3995202b87596a3cc8f6cca3a542be58 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 28 Dec 2016 01:40:22 +0100 Subject: start switch to fancybox2 --- t/20-app-dthumb.t | 2 +- t/21-app-dthumb.files.t | 62 +++---------------------------------------------- t/29-app-dthumb-data.t | 4 ++-- t/cmp/index.lightbox | 1 - t/cmp/index.names | 26 +++++++++++++-------- t/cmp/index.no-lightbox | 25 -------------------- t/cmp/index.no-names | 26 +++++++++++++-------- 7 files changed, 38 insertions(+), 108 deletions(-) delete mode 120000 t/cmp/index.lightbox delete mode 100644 t/cmp/index.no-lightbox (limited to 't') diff --git a/t/20-app-dthumb.t b/t/20-app-dthumb.t index ec9eb5a..37e72a0 100755 --- a/t/20-app-dthumb.t +++ b/t/20-app-dthumb.t @@ -18,7 +18,7 @@ is($dthumb->{config}->{dir_data}, './.dthumb', 'Data directory is .dthumb'); is($dthumb->{config}->{dir_images}, '.', 'Image directory is .'); is($dthumb->{config}->{dir_thumbs}, './.thumbs', 'Thumbnail directory is dthumbs'); -is($dthumb->{config}->{file_index}, 'index.xhtml', 'index is index.xhtml'); +is($dthumb->{config}->{file_index}, 'index.html', 'index is index.html'); is($dthumb->{config}->{lightbox}, 1, 'Lightbox enabled'); is($dthumb->{config}->{names} , 1, 'Show image names'); diff --git a/t/21-app-dthumb.files.t b/t/21-app-dthumb.files.t index 375a554..f849ef7 100755 --- a/t/21-app-dthumb.files.t +++ b/t/21-app-dthumb.files.t @@ -9,7 +9,7 @@ use Test::More; eval "use File::Slurp"; plan skip_all => 'File::Slurp required' if $@; -plan tests => 14; +plan tests => 9; use_ok('App::Dthumb'); @@ -50,37 +50,6 @@ unlink('t/out/index'); -$conf{names} = 1; -$conf{lightbox} = 1; -$dthumb = App::Dthumb->new(%conf); - -for my $file (qw(one.png two.png)) { - $dthumb->create_thumbnail_html($file); -} -$dthumb->write_out_html(); - -is(read_file('t/out/index'), read_file('t/cmp/index.lightbox'), - 'create_Thumbnail_html / write_out_html with lightbox = 1'); - -unlink('t/out/index'); - - - -$conf{lightbox} = 0; -$dthumb = App::Dthumb->new(%conf); - -for my $file (qw(one.png two.png)) { - $dthumb->create_thumbnail_html($file); -} -$dthumb->write_out_html(); - -is(read_file('t/out/index'), read_file('t/cmp/index.no-lightbox'), - 'create_Thumbnail_html / write_out_html with lightbox = 0'); - -unlink('t/out/index'); - - - $dthumb = App::Dthumb->new(dir_images => 't/out'); $dthumb->create_files(); @@ -94,39 +63,14 @@ for my $file ($dthumb->{data}->list_archived()) { } } rmdir('t/out/.thumbs'); -rmdir('t/out/.dthumb/lightbox'); -rmdir('t/out/.dthumb/shadowbox'); +rmdir('t/out/.dthumb/css'); +rmdir('t/out/.dthumb/js'); rmdir('t/out/.dthumb'); is_deeply([sort $dthumb->{data}->list_archived()], [sort @created_files], 'create_files: All files created'); @created_files = (); - - -$dthumb = App::Dthumb->new(dir_images => 't/out', lightbox => 0); -$dthumb->create_files(); - -ok(-d 't/out/.thumbs', 'create_files: Creates thumb dir (lightbox=0)'); -ok(-d 't/out/.dthumb', 'create_files: Creates data dir (lightbox=0)'); - -for my $file (@indep_files) { - if (-e "t/out/.dthumb/${file}") { - push(@created_files, $file); - unlink("t/out/.dthumb/${file}"); - } -} -rmdir('t/out/.thumbs'); -rmdir('t/out/.dthumb/lightbox'); -rmdir('t/out/.dthumb/shadowbox'); -rmdir('t/out/.dthumb'); - -is_deeply([sort @indep_files], [sort @created_files], - 'create_files: All lightbox-independent files created'); -@created_files = (); - - - $dthumb = App::Dthumb->new(%conf); $dthumb->read_directories(); diff --git a/t/29-app-dthumb-data.t b/t/29-app-dthumb-data.t index faa8874..f20110a 100755 --- a/t/29-app-dthumb-data.t +++ b/t/29-app-dthumb-data.t @@ -9,8 +9,8 @@ use File::Slurp qw(read_dir); use Test::More; my @files = grep { ! -d "share/$_" } read_dir('share'); -push(@files, map { "lightbox/$_" } read_dir('share/lightbox')); -push(@files, map { "shadowbox/$_" } read_dir('share/shadowbox')); +push(@files, map { "css/$_" } read_dir('share/css')); +push(@files, map { "js/$_" } read_dir('share/js')); my @files_archived = sort grep { ! /\.dthumb$/ } @files; diff --git a/t/cmp/index.lightbox b/t/cmp/index.lightbox deleted file mode 120000 index 122ada1..0000000 --- a/t/cmp/index.lightbox +++ /dev/null @@ -1 +0,0 @@ -index.names \ No newline at end of file diff --git a/t/cmp/index.names b/t/cmp/index.names index d89df57..d714ab5 100644 --- a/t/cmp/index.names +++ b/t/cmp/index.names @@ -1,23 +1,29 @@ - - + + dthumb - - - - - + + + + + + + +
- + one.png
one.png
- + two.png
two.png diff --git a/t/cmp/index.no-lightbox b/t/cmp/index.no-lightbox deleted file mode 100644 index 93869ca..0000000 --- a/t/cmp/index.no-lightbox +++ /dev/null @@ -1,25 +0,0 @@ - - - - dthumb - - - - -
-
- - one.png -
- one.png -
-
- - two.png -
- two.png -
-
- - diff --git a/t/cmp/index.no-names b/t/cmp/index.no-names index 9879601..e1e9e2c 100644 --- a/t/cmp/index.no-names +++ b/t/cmp/index.no-names @@ -1,21 +1,27 @@ - - + + dthumb - - - - - + + + + + + + +
- + one.png
- + two.png
-- cgit v1.2.3