summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2016-12-28 01:40:22 +0100
committerDaniel Friesel <derf@finalrewind.org>2016-12-28 01:40:22 +0100
commit1af791ab3995202b87596a3cc8f6cca3a542be58 (patch)
tree758f06be79200c519d90ee6fd2008eede10fcf5a /t
parentf031a3971aa32839917afb8c6b4ac2878f70b545 (diff)
start switch to fancybox2
Diffstat (limited to 't')
-rwxr-xr-xt/20-app-dthumb.t2
-rwxr-xr-xt/21-app-dthumb.files.t62
-rwxr-xr-xt/29-app-dthumb-data.t4
l---------t/cmp/index.lightbox1
-rw-r--r--t/cmp/index.names26
-rw-r--r--t/cmp/index.no-lightbox25
-rw-r--r--t/cmp/index.no-names26
7 files changed, 38 insertions, 108 deletions
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html>
+<html>
<head>
<title>dthumb</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
- <link rel="stylesheet" type="text/css" href=".dthumb/main.css"/>
-<link rel="stylesheet" type="text/css" href=".dthumb/lightbox/lightbox.css"/>
-<script type="text/javascript" src=".dthumb/lightbox/lightbox.js"></script>
-
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <script type="text/javascript" src=".dthumb/js/jquery-1.10.2.min.js"></script>
+ <script type="text/javascript" src=".dthumb/js/jquery.mousewheel-3.0.6.pack.js"></script>
+ <script type="text/javascript" src=".dthumb/js/jquery.fancybox.pack.js"></script>
+ <link rel="stylesheet" type="text/css" href=".dthumb/css/jquery.fancybox.css" media="screen" />
+ <link rel="stylesheet" type="text/css" href=".dthumb/css/main.css"/>
+ <script type="text/javascript">//<![CDATA[
+ $(document).ready(function() {
+ $('.fancybox').fancybox();
+ });
+ //]]</script>
</head>
<body><div>
<div class="image-container">
- <a rel="lightbox" href="one.png" title="one.png">
+ <a class="fancybox" href="one.png" title="one.png" data-fancybox-group="gallery">
<img src="t/imgdir/.thumbs/one.png" alt="one.png" /></a>
<br />
<a style="text-decoration: none;" href="one.png">one.png</a>
</div>
<div class="image-container">
- <a rel="lightbox" href="two.png" title="two.png">
+ <a class="fancybox" href="two.png" title="two.png" data-fancybox-group="gallery">
<img src="t/imgdir/.thumbs/two.png" alt="two.png" /></a>
<br />
<a style="text-decoration: none;" href="two.png">two.png</a>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
- <title>dthumb</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
- <link rel="stylesheet" type="text/css" href=".dthumb/main.css"/>
-<!-- $lightbox -->
-</head>
-<body><div>
-<div class="image-container">
- <a rel="lightbox" href="one.png" title="one.png">
- <img src="t/imgdir/.thumbs/one.png" alt="one.png" /></a>
- <br />
- <a style="text-decoration: none;" href="one.png">one.png</a>
-</div>
-<div class="image-container">
- <a rel="lightbox" href="two.png" title="two.png">
- <img src="t/imgdir/.thumbs/two.png" alt="two.png" /></a>
- <br />
- <a style="text-decoration: none;" href="two.png">two.png</a>
-</div>
-</div>
-</body>
-</html>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html>
+<html>
<head>
<title>dthumb</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
- <link rel="stylesheet" type="text/css" href=".dthumb/main.css"/>
-<link rel="stylesheet" type="text/css" href=".dthumb/lightbox/lightbox.css"/>
-<script type="text/javascript" src=".dthumb/lightbox/lightbox.js"></script>
-
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <script type="text/javascript" src=".dthumb/js/jquery-1.10.2.min.js"></script>
+ <script type="text/javascript" src=".dthumb/js/jquery.mousewheel-3.0.6.pack.js"></script>
+ <script type="text/javascript" src=".dthumb/js/jquery.fancybox.pack.js"></script>
+ <link rel="stylesheet" type="text/css" href=".dthumb/css/jquery.fancybox.css" media="screen" />
+ <link rel="stylesheet" type="text/css" href=".dthumb/css/main.css"/>
+ <script type="text/javascript">//<![CDATA[
+ $(document).ready(function() {
+ $('.fancybox').fancybox();
+ });
+ //]]</script>
</head>
<body><div>
<div class="image-container">
- <a rel="lightbox" href="one.png" title="one.png">
+ <a class="fancybox" href="one.png" title="one.png" data-fancybox-group="gallery">
<img src="t/imgdir/.thumbs/one.png" alt="one.png" /></a>
</div>
<div class="image-container">
- <a rel="lightbox" href="two.png" title="two.png">
+ <a class="fancybox" href="two.png" title="two.png" data-fancybox-group="gallery">
<img src="t/imgdir/.thumbs/two.png" alt="two.png" /></a>
</div>
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-03 08:06:23 +0000