summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
Diffstat (limited to 't')
-rwxr-xr-xt/21-app-dthumb.files.t4
-rwxr-xr-xt/29-app-dthumb-data.t7
-rw-r--r--t/cmp/index.names4
-rw-r--r--t/cmp/index.no-names4
4 files changed, 12 insertions, 7 deletions
diff --git a/t/21-app-dthumb.files.t b/t/21-app-dthumb.files.t
index 83879e9..375a554 100755
--- a/t/21-app-dthumb.files.t
+++ b/t/21-app-dthumb.files.t
@@ -94,6 +94,8 @@ 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');
is_deeply([sort $dthumb->{data}->list_archived()], [sort @created_files],
@@ -115,6 +117,8 @@ for my $file (@indep_files) {
}
}
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],
diff --git a/t/29-app-dthumb-data.t b/t/29-app-dthumb-data.t
index 3790006..faa8874 100755
--- a/t/29-app-dthumb-data.t
+++ b/t/29-app-dthumb-data.t
@@ -5,11 +5,12 @@ use 5.010;
use autodie;
use App::Dthumb::Data;
+use File::Slurp qw(read_dir);
use Test::More;
-opendir(my $share, 'share');
-my @files = grep { /^[^.]/ } readdir($share);
-closedir($share);
+my @files = grep { ! -d "share/$_" } read_dir('share');
+push(@files, map { "lightbox/$_" } read_dir('share/lightbox'));
+push(@files, map { "shadowbox/$_" } read_dir('share/shadowbox'));
my @files_archived = sort grep { ! /\.dthumb$/ } @files;
diff --git a/t/cmp/index.names b/t/cmp/index.names
index 72e0e94..d89df57 100644
--- a/t/cmp/index.names
+++ b/t/cmp/index.names
@@ -5,8 +5,8 @@
<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.css"/>
-<script type="text/javascript" src=".dthumb/lightbox.js"></script>
+<link rel="stylesheet" type="text/css" href=".dthumb/lightbox/lightbox.css"/>
+<script type="text/javascript" src=".dthumb/lightbox/lightbox.js"></script>
</head>
<body><div>
diff --git a/t/cmp/index.no-names b/t/cmp/index.no-names
index cdc6311..9879601 100644
--- a/t/cmp/index.no-names
+++ b/t/cmp/index.no-names
@@ -5,8 +5,8 @@
<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.css"/>
-<script type="text/javascript" src=".dthumb/lightbox.js"></script>
+<link rel="stylesheet" type="text/css" href=".dthumb/lightbox/lightbox.css"/>
+<script type="text/javascript" src=".dthumb/lightbox/lightbox.js"></script>
</head>
<body><div>