From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Jul 2010 17:50:06 +0000 (-0400)
Subject: some other (similar) failure cases
X-Git-Tag: 3.20100722~23
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a291f24be6af3f08573efa72f8809868120cfab4?ds=sidebyside;hp=bfa4660df78aaae5f7c2b41caeccf6732ed4d74e

some other (similar) failure cases
---

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"));