urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

another class of conflicts: subdir/file conflicts

master
Joey Hess 2010-07-18 17:16:39 -04:00
parent 2bf3a6edbb
commit 1dbb2632ef
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
t/conflicts.t
View File

@ -2,7 +2,7 @@
# Tests for bugs relating to conflicting files in the srcdir # Tests for bugs relating to conflicting files in the srcdir
use warnings; use warnings;
use strict; use strict;
use Test::More tests => 92; use Test::More tests => 106;
# setup # setup
my $srcdir="t/tmp/src"; my $srcdir="t/tmp/src";
@ -64,6 +64,19 @@ setupiki("initial setup");
ok(! system("touch $srcdir/foo.mdwn")); ok(! system("touch $srcdir/foo.mdwn"));
refreshiki("conflicting non-page added (page already existing) in refresh"); 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. # Changing a page file into a non-page could also cause ikiwiki to fail.
newsrcdir(); newsrcdir();
ok(! system("touch $srcdir/foo.mdwn")); ok(! system("touch $srcdir/foo.mdwn"));