summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-18 13:50:06 -0400
committerJoey Hess <joey@kitenet.net>2010-07-18 13:50:06 -0400
commita291f24be6af3f08573efa72f8809868120cfab4 (patch)
tree6a28733dc3f672470b3be89a94e4edaf8ff05518
parentbfa4660df78aaae5f7c2b41caeccf6732ed4d74e (diff)
some other (similar) failure cases
-rwxr-xr-xt/conflicts.t16
1 files changed, 16 insertions, 0 deletions
diff --git a/t/conflicts.t b/t/conflicts.t
index ac5f93b03..ac270e806 100755
--- a/t/conflicts.t
+++ b/t/conflicts.t
@@ -48,6 +48,22 @@ ok(! system("touch $srcdir/foo.mdwn"));
ok(! system("touch $srcdir/foo.txt"));
setupiki("conflicting page sources in setup");
+# Page and non-page file with same pagename.
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+ok(! system("touch $srcdir/foo"));
+setupiki("conflicting page and non-page in setup");
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki("initial setup");
+ok(! system("touch $srcdir/foo"));
+refreshiki("conflicting page added (non-page already existing) in refresh");
+newsrcdir();
+ok(! system("touch $srcdir/foo"));
+setupiki("initial setup");
+ok(! system("touch $srcdir/foo.mdwn"));
+refreshiki("conflicting non-page added (page already existing) in refresh");
+
# Changing a page file into a non-page could also cause ikiwiki to fail.
newsrcdir();
ok(! system("touch $srcdir/foo.mdwn"));