From 523ac9f64cd5851771387c10b2dd85a326edec80 Mon Sep 17 00:00:00 2001 From: Bruno Binet Date: Sat, 1 Dec 2012 18:22:54 +0100 Subject: [PATCH] update functional test output (relative cross-site links support) $ LC_ALL="C" pelican -o tests/output/custom/ -s samples/pelican.conf.py \ samples/content/ $ LC_ALL="C" pelican -o tests/output/basic/ samples/content/ --- tests/output/basic/a-markdown-powered-article.html | 4 ++-- tests/output/basic/category/cat1.html | 4 ++-- tests/output/basic/category/misc.html | 4 ++-- tests/output/basic/feeds/all-en.atom.xml | 8 ++++---- tests/output/basic/feeds/all.atom.xml | 8 ++++---- tests/output/basic/feeds/cat1.atom.xml | 4 ++-- tests/output/basic/feeds/misc.atom.xml | 4 ++-- tests/output/basic/index.html | 8 ++++---- tests/output/basic/unbelievable.html | 4 ++-- tests/output/custom/a-markdown-powered-article.html | 4 ++-- tests/output/custom/author/alexis-metaireau.html | 4 ++-- tests/output/custom/author/alexis-metaireau2.html | 6 +++--- tests/output/custom/category/bar.html | 2 +- tests/output/custom/category/cat1.html | 4 ++-- tests/output/custom/category/misc.html | 4 ++-- tests/output/custom/category/yeah.html | 4 ++-- tests/output/custom/index.html | 4 ++-- tests/output/custom/index2.html | 6 +++--- tests/output/custom/oh-yeah.html | 2 +- tests/output/custom/pages/this-is-a-test-page.html | 2 +- tests/output/custom/tag/bar.html | 2 +- tests/output/custom/tag/foobar.html | 4 ++-- tests/output/custom/tag/oh.html | 2 +- tests/output/custom/tag/yeah.html | 2 +- tests/output/custom/this-is-a-super-article.html | 4 ++-- tests/output/custom/unbelievable.html | 4 ++-- 26 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tests/output/basic/a-markdown-powered-article.html b/tests/output/basic/a-markdown-powered-article.html index 0e4e31f0..80a12212 100644 --- a/tests/output/basic/a-markdown-powered-article.html +++ b/tests/output/basic/a-markdown-powered-article.html @@ -46,8 +46,8 @@

In cat1.

You're mutually oblivious.

-

a root-relative link to unbelievable -a file-relative link to unbelievable

+

a root-relative link to unbelievable +a file-relative link to unbelievable

diff --git a/tests/output/basic/category/cat1.html b/tests/output/basic/category/cat1.html index bc149fc6..b8ae397e 100644 --- a/tests/output/basic/category/cat1.html +++ b/tests/output/basic/category/cat1.html @@ -43,8 +43,8 @@

In cat1.

You're mutually oblivious.

-

a root-relative link to unbelievable -a file-relative link to unbelievable

+

a root-relative link to unbelievable +a file-relative link to unbelievable

Other articles

diff --git a/tests/output/basic/category/misc.html b/tests/output/basic/category/misc.html index 6a088793..86cf5470 100644 --- a/tests/output/basic/category/misc.html +++ b/tests/output/basic/category/misc.html @@ -69,8 +69,8 @@

In misc.

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -a file-relative link to markdown-article

+

a root-relative link to markdown-article +a file-relative link to markdown-article

read more diff --git a/tests/output/basic/feeds/all-en.atom.xml b/tests/output/basic/feeds/all-en.atom.xml index bc5418a7..fc05c4b3 100644 --- a/tests/output/basic/feeds/all-en.atom.xml +++ b/tests/output/basic/feeds/all-en.atom.xml @@ -1,8 +1,8 @@ A Pelican Blog/2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00Ztag:,2012-02-29:second-article.html<p>This is some article, in english</p> A markdown powered article2011-04-20T00:00:00Ztag:,2011-04-20:a-markdown-powered-article.html<p>You're mutually oblivious.</p> -<p><a href="unbelievable.html">a root-relative link to unbelievable</a> -<a href="unbelievable.html">a file-relative link to unbelievable</a></p>Article 12011-02-17T00:00:00Ztag:,2011-02-17:article-1.html<p>Article 1</p> +<p><a href="/unbelievable.html">a root-relative link to unbelievable</a> +<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>Article 12011-02-17T00:00:00Ztag:,2011-02-17:article-1.html<p>Article 1</p> Article 22011-02-17T00:00:00Ztag:,2011-02-17:article-2.html<p>Article 2</p> Article 32011-02-17T00:00:00Ztag:,2011-02-17:article-3.html<p>Article 3</p> This is a super article !2010-12-02T10:14:00ZAlexis Métaireautag:,2010-12-02:this-is-a-super-article.html<p>Some content here !</p> @@ -24,6 +24,6 @@ YEAH !</p> <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /> </div> Unbelievable !2010-10-15T20:30:00Ztag:,2010-10-15:unbelievable.html<p>Or completely awesome. Depends the needs.</p> -<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a> -<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p> +<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a> +<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p> \ No newline at end of file diff --git a/tests/output/basic/feeds/all.atom.xml b/tests/output/basic/feeds/all.atom.xml index 645c5890..f3a1a6f4 100644 --- a/tests/output/basic/feeds/all.atom.xml +++ b/tests/output/basic/feeds/all.atom.xml @@ -2,8 +2,8 @@ A Pelican Blog/2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00Ztag:,2012-02-29:second-article.html<p>This is some article, in english</p> Deuxième article2012-02-29T00:00:00Ztag:,2012-02-29:second-article-fr.html<p>Ceci est un article, en français.</p> A markdown powered article2011-04-20T00:00:00Ztag:,2011-04-20:a-markdown-powered-article.html<p>You're mutually oblivious.</p> -<p><a href="unbelievable.html">a root-relative link to unbelievable</a> -<a href="unbelievable.html">a file-relative link to unbelievable</a></p>Article 12011-02-17T00:00:00Ztag:,2011-02-17:article-1.html<p>Article 1</p> +<p><a href="/unbelievable.html">a root-relative link to unbelievable</a> +<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>Article 12011-02-17T00:00:00Ztag:,2011-02-17:article-1.html<p>Article 1</p> Article 22011-02-17T00:00:00Ztag:,2011-02-17:article-2.html<p>Article 2</p> Article 32011-02-17T00:00:00Ztag:,2011-02-17:article-3.html<p>Article 3</p> This is a super article !2010-12-02T10:14:00ZAlexis Métaireautag:,2010-12-02:this-is-a-super-article.html<p>Some content here !</p> @@ -25,6 +25,6 @@ YEAH !</p> <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /> </div> Unbelievable !2010-10-15T20:30:00Ztag:,2010-10-15:unbelievable.html<p>Or completely awesome. Depends the needs.</p> -<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a> -<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p> +<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a> +<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p> \ No newline at end of file diff --git a/tests/output/basic/feeds/cat1.atom.xml b/tests/output/basic/feeds/cat1.atom.xml index 3d8100fd..2fa534aa 100644 --- a/tests/output/basic/feeds/cat1.atom.xml +++ b/tests/output/basic/feeds/cat1.atom.xml @@ -1,7 +1,7 @@ A Pelican Blog/2011-04-20T00:00:00ZA markdown powered article2011-04-20T00:00:00Ztag:,2011-04-20:a-markdown-powered-article.html<p>You're mutually oblivious.</p> -<p><a href="unbelievable.html">a root-relative link to unbelievable</a> -<a href="unbelievable.html">a file-relative link to unbelievable</a></p>Article 12011-02-17T00:00:00Ztag:,2011-02-17:article-1.html<p>Article 1</p> +<p><a href="/unbelievable.html">a root-relative link to unbelievable</a> +<a href="/unbelievable.html">a file-relative link to unbelievable</a></p>Article 12011-02-17T00:00:00Ztag:,2011-02-17:article-1.html<p>Article 1</p> Article 22011-02-17T00:00:00Ztag:,2011-02-17:article-2.html<p>Article 2</p> Article 32011-02-17T00:00:00Ztag:,2011-02-17:article-3.html<p>Article 3</p> \ No newline at end of file diff --git a/tests/output/basic/feeds/misc.atom.xml b/tests/output/basic/feeds/misc.atom.xml index 8e5477ba..40ad44c5 100644 --- a/tests/output/basic/feeds/misc.atom.xml +++ b/tests/output/basic/feeds/misc.atom.xml @@ -1,6 +1,6 @@ A Pelican Blog/2012-02-29T00:00:00ZSecond article2012-02-29T00:00:00Ztag:,2012-02-29:second-article.html<p>This is some article, in english</p> Unbelievable !2010-10-15T20:30:00Ztag:,2010-10-15:unbelievable.html<p>Or completely awesome. Depends the needs.</p> -<p><a class="reference external" href="a-markdown-powered-article.html">a root-relative link to markdown-article</a> -<a class="reference external" href="a-markdown-powered-article.html">a file-relative link to markdown-article</a></p> +<p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a> +<a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p> \ No newline at end of file diff --git a/tests/output/basic/index.html b/tests/output/basic/index.html index 9c00402e..97bb5256 100644 --- a/tests/output/basic/index.html +++ b/tests/output/basic/index.html @@ -69,8 +69,8 @@

In cat1.

You're mutually oblivious.

-

a root-relative link to unbelievable -a file-relative link to unbelievable

+

a root-relative link to unbelievable +a file-relative link to unbelievable

read more @@ -214,8 +214,8 @@ YEAH !

In misc.

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -a file-relative link to markdown-article

+

a root-relative link to markdown-article +a file-relative link to markdown-article

read more diff --git a/tests/output/basic/unbelievable.html b/tests/output/basic/unbelievable.html index 95bc7b85..36a1703c 100644 --- a/tests/output/basic/unbelievable.html +++ b/tests/output/basic/unbelievable.html @@ -46,8 +46,8 @@

In misc.

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -a file-relative link to markdown-article

+

a root-relative link to markdown-article +a file-relative link to markdown-article

diff --git a/tests/output/custom/a-markdown-powered-article.html b/tests/output/custom/a-markdown-powered-article.html index 52d0e5f9..49c0d422 100644 --- a/tests/output/custom/a-markdown-powered-article.html +++ b/tests/output/custom/a-markdown-powered-article.html @@ -53,8 +53,8 @@

In cat1.

You're mutually oblivious.

-

a root-relative link to unbelievable -a file-relative link to unbelievable

+

a root-relative link to unbelievable +a file-relative link to unbelievable

Comments !

diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html index 5a36c27e..eb39ae57 100644 --- a/tests/output/custom/author/alexis-metaireau.html +++ b/tests/output/custom/author/alexis-metaireau.html @@ -50,8 +50,8 @@

In cat1.

You're mutually oblivious.

-

a root-relative link to unbelievable -a file-relative link to unbelievable

There are comments.

+

a root-relative link to unbelievable +a file-relative link to unbelievable

There are comments.

Other articles

diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html index e456805b..a87c85af 100644 --- a/tests/output/custom/author/alexis-metaireau2.html +++ b/tests/output/custom/author/alexis-metaireau2.html @@ -62,7 +62,7 @@

Why not ?

After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !

-alternate text +alternate text
read more @@ -142,8 +142,8 @@ as well as inline markup.

In misc.

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -a file-relative link to markdown-article

+

a root-relative link to markdown-article +a file-relative link to markdown-article

read more

There are comments.

diff --git a/tests/output/custom/category/bar.html b/tests/output/custom/category/bar.html index d291b9df..253d64ea 100644 --- a/tests/output/custom/category/bar.html +++ b/tests/output/custom/category/bar.html @@ -55,7 +55,7 @@

Why not ?

After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !

-alternate text +alternate text

There are comments.

diff --git a/tests/output/custom/category/cat1.html b/tests/output/custom/category/cat1.html index 9316faf0..8c265d41 100644 --- a/tests/output/custom/category/cat1.html +++ b/tests/output/custom/category/cat1.html @@ -50,8 +50,8 @@

In cat1.

You're mutually oblivious.

-

a root-relative link to unbelievable -a file-relative link to unbelievable

There are comments.

+

a root-relative link to unbelievable +a file-relative link to unbelievable

There are comments.

Other articles

diff --git a/tests/output/custom/category/misc.html b/tests/output/custom/category/misc.html index 6609ce25..24a53791 100644 --- a/tests/output/custom/category/misc.html +++ b/tests/output/custom/category/misc.html @@ -79,8 +79,8 @@

In misc.

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -a file-relative link to markdown-article

+

a root-relative link to markdown-article +a file-relative link to markdown-article

read more

There are comments.

diff --git a/tests/output/custom/category/yeah.html b/tests/output/custom/category/yeah.html index 587e2f97..c39e1a86 100644 --- a/tests/output/custom/category/yeah.html +++ b/tests/output/custom/category/yeah.html @@ -53,8 +53,8 @@

This is a simple title

And here comes the cool stuff.

-alternate text -alternate text +alternate text +alternate text 
 >>> from ipdb import set_trace
 >>> set_trace()
diff --git a/tests/output/custom/index.html b/tests/output/custom/index.html
index 7b7cb84b..eab96fa1 100644
--- a/tests/output/custom/index.html
+++ b/tests/output/custom/index.html
@@ -79,8 +79,8 @@
         
In cat1. 

 
                 
You're mutually oblivious.

-
a root-relative link to unbelievable
-a file-relative link to unbelievable

+
a root-relative link to unbelievable
+a file-relative link to unbelievable

                 read more
                 
There are comments.
diff --git a/tests/output/custom/index2.html b/tests/output/custom/index2.html index 8e308821..5269ed70 100644 --- a/tests/output/custom/index2.html +++ b/tests/output/custom/index2.html @@ -113,7 +113,7 @@ as well as inline markup.

Why not ?

After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !

-alternate text +alternate text read more @@ -140,8 +140,8 @@ YEAH !

In misc.

Or completely awesome. Depends the needs.

-

a root-relative link to markdown-article -a file-relative link to markdown-article

+

a root-relative link to markdown-article +a file-relative link to markdown-article

read more

There are comments.

diff --git a/tests/output/custom/oh-yeah.html b/tests/output/custom/oh-yeah.html index aafcc69d..cb30a7d6 100644 --- a/tests/output/custom/oh-yeah.html +++ b/tests/output/custom/oh-yeah.html @@ -58,7 +58,7 @@

Why not ?

After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !

-alternate text +alternate text diff --git a/tests/output/custom/pages/this-is-a-test-page.html b/tests/output/custom/pages/this-is-a-test-page.html index 6cb1c582..5df98726 100644 --- a/tests/output/custom/pages/this-is-a-test-page.html +++ b/tests/output/custom/pages/this-is-a-test-page.html @@ -38,7 +38,7 @@

This is a test page

Just an image.

-alternate text +alternate text
diff --git a/tests/output/custom/tag/bar.html b/tests/output/custom/tag/bar.html index 319f9595..85bc5a07 100644 --- a/tests/output/custom/tag/bar.html +++ b/tests/output/custom/tag/bar.html @@ -137,7 +137,7 @@ as well as inline markup.

Why not ?

After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !

-alternate text +alternate text read more diff --git a/tests/output/custom/tag/foobar.html b/tests/output/custom/tag/foobar.html index c8653686..b7a257e4 100644 --- a/tests/output/custom/tag/foobar.html +++ b/tests/output/custom/tag/foobar.html @@ -53,8 +53,8 @@

This is a simple title

And here comes the cool stuff.

-alternate text -alternate text +alternate text +alternate text 
 >>> from ipdb import set_trace
 >>> set_trace()
diff --git a/tests/output/custom/tag/oh.html b/tests/output/custom/tag/oh.html
index ddec0f41..451b1031 100644
--- a/tests/output/custom/tag/oh.html
+++ b/tests/output/custom/tag/oh.html
@@ -55,7 +55,7 @@
 
Why not ?

 
After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
 YEAH !

-alternate text
+alternate text

There are comments.

diff --git a/tests/output/custom/tag/yeah.html b/tests/output/custom/tag/yeah.html index a000affd..151eb64c 100644 --- a/tests/output/custom/tag/yeah.html +++ b/tests/output/custom/tag/yeah.html @@ -55,7 +55,7 @@

Why not ?

After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !

-alternate text +alternate text

There are comments.

diff --git a/tests/output/custom/this-is-a-super-article.html b/tests/output/custom/this-is-a-super-article.html index 0f1e198b..98d22351 100644 --- a/tests/output/custom/this-is-a-super-article.html +++ b/tests/output/custom/this-is-a-super-article.html @@ -56,8 +56,8 @@

This is a simple title

And here comes the cool stuff.

-alternate text -alternate text +alternate text +alternate text 
 >>> from ipdb import set_trace
 >>> set_trace()
diff --git a/tests/output/custom/unbelievable.html b/tests/output/custom/unbelievable.html
index f22a05a2..691f28f6 100644
--- a/tests/output/custom/unbelievable.html
+++ b/tests/output/custom/unbelievable.html
@@ -53,8 +53,8 @@
         
In misc. 

 
       
Or completely awesome. Depends the needs.

-
a root-relative link to markdown-article
-a file-relative link to markdown-article

+
a root-relative link to markdown-article
+a file-relative link to markdown-article