summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-18 17:16:39 -0400
committerJoey Hess <joey@kitenet.net>2010-07-18 17:16:39 -0400
commit1dbb2632ef5f7eaa1f5745d587b1373b45b09e56 (patch)
treee64c08e6741d2e0f317a7a62039a0f15c08662da
parent2bf3a6edbbd32c66db8480d598c2c328d8a8a1b8 (diff)
another class of conflicts: subdir/file conflicts
-rwxr-xr-xt/conflicts.t15
1 files changed, 14 insertions, 1 deletions
diff --git a/t/conflicts.t b/t/conflicts.t
index 4664e1b6e..d7e04d3ae 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -2,7 +2,7 @@
# Tests for bugs relating to conflicting files in the srcdir
use warnings;
use strict;
-use Test::More tests => 92;
+use Test::More tests => 106;
# setup
my $srcdir="t/tmp/src";
@@ -64,6 +64,19 @@ setupiki("initial setup");
ok(! system("touch $srcdir/foo.mdwn"));
refreshiki("conflicting non-page added (page already existing) in refresh");
+# Page that renders to a file that is also a subdirectory holding another
+# file.
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("mkdir -p $srcdir/foo/index.html"));
+ok(! system("touch $srcdir/foo/index.html/bar.mdwn"));
+setupiki("conflicting page file and subdirectory");
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("mkdir -p $srcdir/foo/index.html"));
+ok(! system("touch $srcdir/foo/index.html/bar"));
+setupiki("conflicting page file and subdirectory 2");
+
# Changing a page file into a non-page could also cause ikiwiki to fail.
newsrcdir();
ok(! system("touch $srcdir/foo.mdwn"));