summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/todo/Moving_Pages.mdwn2
-rwxr-xr-xt/bazaar.t2
-rwxr-xr-xt/git.t26
3 files changed, 28 insertions, 2 deletions
diff --git a/doc/todo/Moving_Pages.mdwn b/doc/todo/Moving_Pages.mdwn
index bd6507dd0..387e4fb82 100644
--- a/doc/todo/Moving_Pages.mdwn
+++ b/doc/todo/Moving_Pages.mdwn
@@ -10,6 +10,8 @@ Thanks again to [Joey](http://kitenet.net/~joey) for putting ikiwiki together.
*[Kyle](http://kitenet.net/~kyle/)=*
+> Took a bit too long, but [[done]] now. --[[Joey]]
+
----
The MediaWiki moving/renaming mechanism is pretty nice. It's easy to get a list of pages that point to the current page. When renaming a page it sticks a forwarding page in the original place. The larger the size of the wiki the more important organization tools become.
diff --git a/t/bazaar.t b/t/bazaar.t
index 675a143b5..fcdc3d4de 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -66,7 +66,7 @@ IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
@changes = IkiWiki::rcs_recentchanges(4);
-is($#changes, 2);
+is($#changes, 3);
is($changes[0]{pages}[0]{"page"}, "test4.mdwn");
ok(mkdir($config{srcdir}."/newdir"));
diff --git a/t/git.t b/t/git.t
index f4e27c473..0a5ba7266 100755
--- a/t/git.t
+++ b/t/git.t
@@ -15,7 +15,7 @@ BEGIN {
}
}
}
-use Test::More tests => 11;
+use Test::More tests => 16;
BEGIN { use_ok("IkiWiki"); }
@@ -65,4 +65,28 @@ is($changes[0]{pages}[0]{"page"}, "test2.mdwn");
is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
+# Renaming
+
+writefile('test3.mdwn', $config{srcdir}, $test1);
+IkiWiki::rcs_add("test3.mdwn");
+IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
+IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
+
+@changes = IkiWiki::rcs_recentchanges(4);
+
+is($#changes, 3);
+is($changes[0]{pages}[0]{"page"}, "test4.mdwn");
+
+ok(mkdir($config{srcdir}."/newdir"));
+IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");
+IkiWiki::rcs_commit_staged("Added the 5th page", "moo", "Joe User");
+
+@changes = IkiWiki::rcs_recentchanges(4);
+
+is($#changes, 3);
+is($changes[0]{pages}[0]{"page"}, "newdir/test5.mdwn");
+
+IkiWiki::rcs_remove("newdir/test5.mdwn");
+IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");
+
system "rm -rf $dir";