Merge commit 'schmonz/master' into cvs

[ikiwiki.git] / t / po.t

diff --git a/t/po.t b/t/po.t
index e5f56a08d59463f2788fbd8f82625c5a87cb6f1e..b6885a37e0983fb75340ec78e13934fb4fc93e53 100755 (executable)
--- a/t/po.t
+++ b/t/po.t
@@ -64,6 +64,14 @@ foreach my $page (keys %pagesources) {
     $IkiWiki::pagecase{lc $page}=$page;
 }
 
+### populate srcdir
+writefile('index.mdwn', $config{srcdir}, '[[translatable]] [[nontranslatable]]');
+writefile('test1.mdwn', $config{srcdir}, 'test1 content');
+writefile('test2.mdwn', $config{srcdir}, 'test2 content');
+writefile('test3.mdwn', $config{srcdir}, 'test3 content');
+writefile('translatable.mdwn', $config{srcdir}, '[[nontranslatable]]');
+writefile('nontranslatable.mdwn', $config{srcdir}, '[[/]] [[translatable]]');
+
 ### istranslatable/istranslation
 # we run these tests twice because memoization attempts made them
 # succeed once every two tries...
@@ -99,10 +107,6 @@ sub refresh_n_scan(@) {
        }
 }
 
-writefile('index.mdwn', $config{srcdir}, '[[translatable]] [[nontranslatable]]');
-writefile('translatable.mdwn', $config{srcdir}, '[[nontranslatable]]');
-writefile('nontranslatable.mdwn', $config{srcdir}, '[[/]] [[translatable]]');
-
 $config{po_link_to}='negotiated';
 $msgprefix="links (po_link_to=negotiated)";
 refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn');
@@ -143,13 +147,13 @@ is(targetpage('test3.es', 'html'), 'test3.es/index.html', "$msgprefix test3.es (
 $config{po_link_to}='current';
 $msgprefix="urlto (po_link_to=current)";
 is(urlto('', 'index'), './index.en.html', "$msgprefix index -> ''");
-is(urlto('', 'nontranslatable'), './../index.en.html', "$msgprefix nontranslatable -> ''");
-is(urlto('', 'translatable.fr'), './../index.fr.html', "$msgprefix translatable.fr -> ''");
+is(urlto('', 'nontranslatable'), '../index.en.html', "$msgprefix nontranslatable -> ''");
+is(urlto('', 'translatable.fr'), '../index.fr.html', "$msgprefix translatable.fr -> ''");
 $config{po_link_to}='negotiated';
 $msgprefix="urlto (po_link_to=negotiated)";
 is(urlto('', 'index'), './', "$msgprefix index -> ''");
-is(urlto('', 'nontranslatable'), './../', "$msgprefix nontranslatable -> ''");
-is(urlto('', 'translatable.fr'), './../', "$msgprefix translatable.fr -> ''");
+is(urlto('', 'nontranslatable'), '../', "$msgprefix nontranslatable -> ''");
+is(urlto('', 'translatable.fr'), '../', "$msgprefix translatable.fr -> ''");
 
 ### bestlink
 $config{po_link_to}='current';