discount support

[git.ikiwiki.info.git] / t / mercurial.t

diff --git a/t/mercurial.t b/t/mercurial.t
index fc9ab68a34b8f5578effb284279c8753476e1d9d..4918fc76e9a0bb37adecc18ecbf47cc1eba1a795 100755 (executable)
--- a/t/mercurial.t
+++ b/t/mercurial.t
@@ -6,35 +6,49 @@ BEGIN {
        $dir = "/tmp/ikiwiki-test-hg.$$";
        my $hg=`which hg`;
        chomp $hg;
        $dir = "/tmp/ikiwiki-test-hg.$$";
        my $hg=`which hg`;
        chomp $hg;

-       if (! -x $hg || ! mkdir($dir)) {
+       if (! -x $hg) {

                eval q{
                eval q{

-                       use Test::More skip_all => "hg not available or could not make test dir"
+                       use Test::More skip_all => "hg not available"

                }
        }
                }
        }

+       if (! mkdir($dir)) {
+               die $@;
+       }

 }
 }

-use Test::More tests => 9;
+use Test::More tests => 11;

 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "mercurial";
 $config{srcdir} = "$dir/repo";
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "mercurial";
 $config{srcdir} = "$dir/repo";

+IkiWiki::loadplugins();

 IkiWiki::checkconfig();
 
 IkiWiki::checkconfig();
 

+use CGI::Session;
+my $session=CGI::Session->new;
+$session->param("name", "Joe User");
+

 system "hg init $config{srcdir}";
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
 system "hg init $config{srcdir}";
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");

-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+IkiWiki::rcs_commit(
+       file => "test1.mdwn",
+       message => "Added the first page",
+       token => "moo",
+       session => $session,
+);

 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 0);
 is($changes[0]{message}[0]{"line"}, "Added the first page");
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 0);
 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");
+is($changes[0]{user}, "Joe User");

        
 # Manual commit
 my $username = "Foo Bar";
        
 # Manual commit
 my $username = "Foo Bar";


@@ -44,15 +58,18 @@ my $message = "Added the second page";
 my $test2 = readfile("t/test2.mdwn");
 writefile('test2.mdwn', $config{srcdir}, $test2);
 system "hg add -R $config{srcdir} $config{srcdir}/test2.mdwn";
 my $test2 = readfile("t/test2.mdwn");
 writefile('test2.mdwn', $config{srcdir}, $test2);
 system "hg add -R $config{srcdir} $config{srcdir}/test2.mdwn";

-system "hg commit -R $config{srcdir} -u \"$user\" -m \"$message\"";
+system "hg commit -R $config{srcdir} -u \"$user\" -m \"$message\" -d \"0 0\"";

        
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 1);
 is($changes[0]{message}[0]{"line"}, $message);
 is($changes[0]{user}, $username);
        
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 1);
 is($changes[0]{message}[0]{"line"}, $message);
 is($changes[0]{user}, $username);

-is($changes[0]{pages}[0]{"page"}, "test2.mdwn");
+is($changes[0]{pages}[0]{"page"}, "test2");
+
+is($changes[1]{pages}[0]{"page"}, "test1");

 
 

-is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
+my $ctime = IkiWiki::rcs_getctime("test2.mdwn");
+is($ctime, 0);

 
 system "rm -rf $dir";
 
 system "rm -rf $dir";