X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/11872cecfcf40a4f68677a82b0d2db7c8e24dd71..d5be42a0910a1f0b0f6a9796fdbb43d1f02284f2:/t/git.t

diff --git a/t/git.t b/t/git.t
index 0a5ba7266..f1c24b359 100755
--- a/t/git.t
+++ b/t/git.t
@@ -3,38 +3,36 @@ use warnings;
 use strict;
 
 my $dir;
-my $gitrepo;
 BEGIN {
 	$dir="/tmp/ikiwiki-test-git.$$";
-	$gitrepo="$dir/repo";
 	my $git=`which git`;
 	chomp $git;
-	if (! -x $git || ! mkdir($dir) || ! mkdir($gitrepo)) {
+	if (! -x $git || ! mkdir($dir)) {
 		eval q{
-			use Test::More skip_all => "git not available or could not make test dirs"
+			use Test::More skip_all => "git not available or could not make test dir"
 		}
 	}
 }
-use Test::More tests => 16;
+use Test::More tests => 18;
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "git";
 $config{srcdir} = "$dir/src";
+IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
-system "cd $gitrepo && git init >/dev/null 2>&1";
-system "cd $gitrepo && echo dummy > dummy; git add . >/dev/null 2>&1";
-system "cd $gitrepo && git commit -m Initial >/dev/null 2>&1";
-system "git clone -l -s $gitrepo $config{srcdir} >/dev/null 2>&1";
+ok (mkdir($config{srcdir}));
+is (system("./ikiwiki-makerepo git $config{srcdir} $dir/repo"), 0);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 0); # counts for dummy commit during repo creation
-is($changes[0]{message}[0]{"line"}, "Initial");
-is($changes[0]{pages}[0]{"page"}, "dummy");
+# ikiwiki-makerepo's first commit is setting up the .gitignore
+is($changes[0]{message}[0]{"line"}, "initial commit");
+is($changes[0]{pages}[0]{"page"}, ".gitignore");
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
@@ -46,7 +44,7 @@ IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
 
 is($#changes, 1);
 is($changes[0]{message}[0]{"line"}, "Added the first page");
-is($changes[0]{pages}[0]{"page"}, "test1.mdwn");
+is($changes[0]{pages}[0]{"page"}, "test1");
 	
 # Manual commit
 my $message = "Added the second page";
@@ -61,9 +59,9 @@ system "cd $config{srcdir}; git push origin >/dev/null 2>&1";
 
 is($#changes, 2);
 is($changes[0]{message}[0]{"line"}, $message);
-is($changes[0]{pages}[0]{"page"}, "test2.mdwn");
+is($changes[0]{pages}[0]{"page"}, "test2");
 
-is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
+is($changes[1]{pages}[0]{"page"}, "test1");
 
 # Renaming
 
@@ -75,7 +73,7 @@ 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");
+is($changes[0]{pages}[0]{"page"}, "test4");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");
@@ -84,7 +82,7 @@ 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");
+is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
 IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");