From a291f24be6af3f08573efa72f8809868120cfab4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Jul 2010 13:50:06 -0400 Subject: some other (similar) failure cases --- t/conflicts.t | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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")); -- cgit v1.2.3