projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
773db5a
)
2 more cases
author
Joey Hess
<joey@kitenet.net>
Sun, 18 Jul 2010 20:45:44 +0000
(16:45 -0400)
committer
Joey Hess
<joey@kitenet.net>
Sun, 18 Jul 2010 20:45:44 +0000
(16:45 -0400)
t/conflicts.t
patch
|
blob
|
history
diff --git
a/t/conflicts.t
b/t/conflicts.t
index 81b2c12cb963a8b292559cf8fb61108520077ca2..4664e1b6ed4e0404cdd40449de60c5380788fac5 100755
(executable)
--- 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;
# Tests for bugs relating to conflicting files in the srcdir
use warnings;
use strict;
-use Test::More tests =>
76
;
+use Test::More tests =>
92
;
# setup
my $srcdir="t/tmp/src";
# setup
my $srcdir="t/tmp/src";
@@
-86,6
+86,13
@@
setupiki("initial setup");
ok(! system("mkdir -p $srcdir/foo"));
ok(! system("touch $srcdir/foo/index.html"));
refreshiki("rawhtml file rendered same as existing page in refresh");
ok(! system("mkdir -p $srcdir/foo"));
ok(! system("touch $srcdir/foo/index.html"));
refreshiki("rawhtml file rendered same as existing page in refresh");
+# Moved when refreshing
+newsrcdir();
+ok(! system("touch $srcdir/foo.mdwn"));
+setupiki("initial setup");
+ok(! system("mkdir -p $srcdir/foo"));
+ok(! system("mv $srcdir/foo.mdwn $srcdir/foo/index.html"));
+refreshiki("existing page moved to rawhtml file in refresh");
# Inverse added when refreshing
newsrcdir();
ok(! system("mkdir -p $srcdir/foo"));
# Inverse added when refreshing
newsrcdir();
ok(! system("mkdir -p $srcdir/foo"));
@@
-93,6
+100,13
@@
ok(! system("touch $srcdir/foo/index.html"));
setupiki("initial setup");
ok(! system("touch $srcdir/foo.mdwn"));
refreshiki("page rendered same as existing rawhtml file in refresh");
setupiki("initial setup");
ok(! system("touch $srcdir/foo.mdwn"));
refreshiki("page rendered same as existing rawhtml file in refresh");
+# Inverse moved when refreshing
+newsrcdir();
+ok(! system("mkdir -p $srcdir/foo"));
+ok(! system("touch $srcdir/foo/index.html"));
+setupiki("initial setup");
+ok(! system("mv $srcdir/foo/index.html $srcdir/foo.mdwn"));
+refreshiki("rawhtml file moved to page in refresh");
# Present during setup
newsrcdir();
ok(! system("touch $srcdir/foo.mdwn"));
# Present during setup
newsrcdir();
ok(! system("touch $srcdir/foo.mdwn"));