Test suite updates.

diff --git a/t/static_basic/config/blosxom.conf b/t/static_basic/config/blosxom.conf
index 18ddf7ae9f21a7f632137a73649eb643b6d5b1ab..7d8ef268cbb35a2a9386b9a725557372944a76fa 100644 (file)
--- a/t/static_basic/config/blosxom.conf
+++ b/t/static_basic/config/blosxom.conf
@@ -1,6 +1,4 @@
 $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data";
-$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf";
-$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc";
 $static_dir = "$ENV{BLOSXOM_CONFIG_DIR}/../static";
 $static_password = 'static';
 @static_flavours = qw/html rss/;

diff --git a/t/static_basic/config/plugins.conf b/t/static_basic/config/plugins.conf
deleted file mode 100644 (file)
index d3be1b1..0000000
--- a/t/static_basic/config/plugins.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-storydate
-rss20

diff --git a/t/static_basic/expected/2006/07/19/index.rss b/t/static_basic/expected/2006/07/19/index.rss
index 66284371eb84870cd1b926e9f717e2e341be8cea..9d5130fb02959d5336cb222b58299928a2ebd4a1 100644 (file)
--- a/t/static_basic/expected/2006/07/19/index.rss
+++ b/t/static_basic/expected/2006/07/19/index.rss
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-    xmlns:atom="http://www.w3.org/2005/Atom">
+<rss version="2.0">
+  <channel>
+    <title>My Weblog</title>
+    <link>http://localhost/</link>
+    <description>Yet another Blosxom weblog.</description>
+    <language>en</language>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <generator>blosxom/2.0.2</generator>
 
-    <channel>
-        <title>My Weblog</title>
-        <link>http://localhost/</link>
-        <description>Yet another Blosxom weblog.</description>
-        <managingEditor>author@example.com (A. U. Thor)</managingEditor>
-        <webMaster>author@example.com (A. U. Thor)</webMaster>
-        <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
-        <language>en</language>
-        <generator>blosxom 2.0.2</generator>
-        <atom:link href="http://localhost/index.rss" rel="self" type="application/rss+xml" />
-        <sy:updatePeriod>hourly</sy:updatePeriod>
-        <sy:updateFrequency>1</sy:updateFrequency>
-        <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-
-
-        <item>
-            <title>Lorem ipsum</title>
-            <link>http://localhost/1.html</link>
-            <guid isPermaLink="true">http://localhost/1.html</guid>
-            <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
-            <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+  <item>
+    <title>Lorem ipsum</title>
+    <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
+    <link>http://localhost/2006/07/19#1</link>
+    <category></category>
+    <guid isPermaLink="false">/1</guid>
+    <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
 
@@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym
 ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas
 cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon
 ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer
-tyr wuz de ramas cora dola tym ipso hor.
-            </description>
-        </item>
-
-    </channel>
+tyr wuz de ramas cora dola tym ipso hor.</description>
+  </item>
+  </channel>
 </rss>

diff --git a/t/static_basic/expected/2006/07/index.rss b/t/static_basic/expected/2006/07/index.rss
index 66284371eb84870cd1b926e9f717e2e341be8cea..9d5130fb02959d5336cb222b58299928a2ebd4a1 100644 (file)
--- a/t/static_basic/expected/2006/07/index.rss
+++ b/t/static_basic/expected/2006/07/index.rss
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-    xmlns:atom="http://www.w3.org/2005/Atom">
+<rss version="2.0">
+  <channel>
+    <title>My Weblog</title>
+    <link>http://localhost/</link>
+    <description>Yet another Blosxom weblog.</description>
+    <language>en</language>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <generator>blosxom/2.0.2</generator>
 
-    <channel>
-        <title>My Weblog</title>
-        <link>http://localhost/</link>
-        <description>Yet another Blosxom weblog.</description>
-        <managingEditor>author@example.com (A. U. Thor)</managingEditor>
-        <webMaster>author@example.com (A. U. Thor)</webMaster>
-        <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
-        <language>en</language>
-        <generator>blosxom 2.0.2</generator>
-        <atom:link href="http://localhost/index.rss" rel="self" type="application/rss+xml" />
-        <sy:updatePeriod>hourly</sy:updatePeriod>
-        <sy:updateFrequency>1</sy:updateFrequency>
-        <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-
-
-        <item>
-            <title>Lorem ipsum</title>
-            <link>http://localhost/1.html</link>
-            <guid isPermaLink="true">http://localhost/1.html</guid>
-            <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
-            <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+  <item>
+    <title>Lorem ipsum</title>
+    <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
+    <link>http://localhost/2006/07/19#1</link>
+    <category></category>
+    <guid isPermaLink="false">/1</guid>
+    <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
 
@@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym
 ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas
 cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon
 ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer
-tyr wuz de ramas cora dola tym ipso hor.
-            </description>
-        </item>
-
-    </channel>
+tyr wuz de ramas cora dola tym ipso hor.</description>
+  </item>
+  </channel>
 </rss>

diff --git a/t/static_basic/expected/2006/index.rss b/t/static_basic/expected/2006/index.rss
index 66284371eb84870cd1b926e9f717e2e341be8cea..9d5130fb02959d5336cb222b58299928a2ebd4a1 100644 (file)
--- a/t/static_basic/expected/2006/index.rss
+++ b/t/static_basic/expected/2006/index.rss
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-    xmlns:atom="http://www.w3.org/2005/Atom">
+<rss version="2.0">
+  <channel>
+    <title>My Weblog</title>
+    <link>http://localhost/</link>
+    <description>Yet another Blosxom weblog.</description>
+    <language>en</language>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <generator>blosxom/2.0.2</generator>
 
-    <channel>
-        <title>My Weblog</title>
-        <link>http://localhost/</link>
-        <description>Yet another Blosxom weblog.</description>
-        <managingEditor>author@example.com (A. U. Thor)</managingEditor>
-        <webMaster>author@example.com (A. U. Thor)</webMaster>
-        <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
-        <language>en</language>
-        <generator>blosxom 2.0.2</generator>
-        <atom:link href="http://localhost/index.rss" rel="self" type="application/rss+xml" />
-        <sy:updatePeriod>hourly</sy:updatePeriod>
-        <sy:updateFrequency>1</sy:updateFrequency>
-        <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-
-
-        <item>
-            <title>Lorem ipsum</title>
-            <link>http://localhost/1.html</link>
-            <guid isPermaLink="true">http://localhost/1.html</guid>
-            <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
-            <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+  <item>
+    <title>Lorem ipsum</title>
+    <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
+    <link>http://localhost/2006/07/19#1</link>
+    <category></category>
+    <guid isPermaLink="false">/1</guid>
+    <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
 
@@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym
 ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas
 cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon
 ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer
-tyr wuz de ramas cora dola tym ipso hor.
-            </description>
-        </item>
-
-    </channel>
+tyr wuz de ramas cora dola tym ipso hor.</description>
+  </item>
+  </channel>
 </rss>

diff --git a/t/static_basic/expected/index.rss b/t/static_basic/expected/index.rss
index 66284371eb84870cd1b926e9f717e2e341be8cea..9d5130fb02959d5336cb222b58299928a2ebd4a1 100644 (file)
--- a/t/static_basic/expected/index.rss
+++ b/t/static_basic/expected/index.rss
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
-    xmlns:atom="http://www.w3.org/2005/Atom">
+<rss version="2.0">
+  <channel>
+    <title>My Weblog</title>
+    <link>http://localhost/</link>
+    <description>Yet another Blosxom weblog.</description>
+    <language>en</language>
+    <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+    <generator>blosxom/2.0.2</generator>
 
-    <channel>
-        <title>My Weblog</title>
-        <link>http://localhost/</link>
-        <description>Yet another Blosxom weblog.</description>
-        <managingEditor>author@example.com (A. U. Thor)</managingEditor>
-        <webMaster>author@example.com (A. U. Thor)</webMaster>
-        <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
-        <language>en</language>
-        <generator>blosxom 2.0.2</generator>
-        <atom:link href="http://localhost/index.rss" rel="self" type="application/rss+xml" />
-        <sy:updatePeriod>hourly</sy:updatePeriod>
-        <sy:updateFrequency>1</sy:updateFrequency>
-        <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
-
-
-        <item>
-            <title>Lorem ipsum</title>
-            <link>http://localhost/1.html</link>
-            <guid isPermaLink="true">http://localhost/1.html</guid>
-            <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
-            <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+  <item>
+    <title>Lorem ipsum</title>
+    <pubDate>Wed, 19 Jul 2006 22:54:00 +0000</pubDate>
+    <link>http://localhost/2006/07/19#1</link>
+    <category></category>
+    <guid isPermaLink="false">/1</guid>
+    <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
 facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
 amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
 
@@ -38,9 +28,7 @@ cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym
 ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas
 cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon
 ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer
-tyr wuz de ramas cora dola tym ipso hor.
-            </description>
-        </item>
-
-    </channel>
+tyr wuz de ramas cora dola tym ipso hor.</description>
+  </item>
+  </channel>
 </rss>

diff --git a/t/templates/config/blosxom.conf b/t/templates/config/blosxom.conf
index 27d4b12682375a4679a4db721b8ed5357507ce20..ae83e4801bdebfef079a65403b309bab91ca20e4 100644 (file)
--- a/t/templates/config/blosxom.conf
+++ b/t/templates/config/blosxom.conf
@@ -1,3 +1 @@
 $datadir = "$ENV{BLOSXOM_CONFIG_DIR}/../data";
-$plugin_list = "$ENV{BLOSXOM_CONFIG_DIR}/plugins.conf";
-$plugin_path = "$ENV{BLOSXOM_CONFIG_DIR}/../../../general:$ENV{BLOSXOM_CONFIG_DIR}/../../../gavinc";

diff --git a/t/templates/config/plugins.conf b/t/templates/config/plugins.conf
deleted file mode 100644 (file)
index d3be1b1..0000000
--- a/t/templates/config/plugins.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-storydate
-rss20

diff --git a/t/templates/expected.html b/t/templates/expected.html
new file mode 100644 (file)
index 0000000..22ee8a0
--- /dev/null
+++ b/t/templates/expected.html
@@ -0,0 +1,34 @@
+Content-Type: text/xhtml; charset=UTF-8\r
+\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+    <head>
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="http://localhost/index.rss" />
+        <title>My Weblog   
+        </title>
+    </head>
+    <body>
+        <h1>My Weblog</h1>
+        <h2>  </h2>
+        <h3>2006-07-19</h3>
+        <h4><a name="1">Lorem ipsum</a></h4>
+        <div>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
+amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
+
+facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet
+ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor
+sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
+
+Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz
+de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas
+cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym
+ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas
+cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon
+ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer
+tyr wuz de ramas cora dola tym ipso hor.</div>
+        <p>posted at: 22:54 | path: <a href="http://localhost"> </a> | <a href="http://localhost/2006/07/19#1">permanent link to this entry</a></p>
+
+    </body>
+</html>

diff --git a/t/templates/expected.rss b/t/templates/expected.rss
new file mode 100644 (file)
index 0000000..a03fc8a
--- /dev/null
+++ b/t/templates/expected.rss
@@ -0,0 +1,34 @@
+Content-Type: text/xml; charset=ISO-8859-1\r
+\r
+<?xml version="1.0"?>
+<!-- name="generator" content="blosxom/2.0.2" -->
+<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN" "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+
+<rss version="0.91">
+  <channel>
+    <title>My Weblog   </title>
+    <link>http://localhost/./blosxom.cgi</link>
+    <description>Yet another Blosxom weblog.</description>
+    <language>en</language>
+
+  <item>
+    <title>Lorem ipsum</title>
+    <link>http://localhost/./blosxom.cgi/2006/07/19#1</link>
+    <description>Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet ipso
+facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor sit
+amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
+
+facto.Lorem ipsum dolor sit amet ipso facto.Lorem ipsum dolor sit amet
+ipso facto.Lorem ipsum dolor sit amet ipso facto. Lorem ipsum dolor
+sit amet ipso facto.Lorem ipsum dolor sit amet ipso facto. 
+
+Lorem ipso hoccer foer tyr wuz de ras cora dola tymon ipso hoc cer fuz
+de ramas cora dola tymon ipso hoccer. Lorem ipso foer tyr wuz de ramas
+cora dola tym ipso hor.Lorem ipso foer tyr wuz de ramas cora dola tym
+ipso hor tyr wuz de ramas cora dola tymon ipso foer tyr wuz de ramas
+cora dola tymo. Lorem ipso hoccer foer tyr wuz de ras cora dola tymon
+ipso hoc cer fuz de ramas cora dola tymon ipso hoccer. Lorem ipso foer
+tyr wuz de ramas cora dola tym ipso hor.</description>
+  </item>
+  </channel>
+</rss>

diff --git a/t/templates/spec.yaml b/t/templates/spec.yaml
index 167aadb04b9036872c970f2ec39180a7e842471f..93883d30106a79ae6c8617a896be9b0d97e02c17 100644 (file)
--- a/t/templates/spec.yaml
+++ b/t/templates/spec.yaml
@@ -1,13 +1,4 @@
 tests:
   - 
     - ""
-    - "expected/index.html"
-  - 
-    - "path=/index.rss"
-    - "expected/index.rss"
-  - 
-    - "path=/web/index.html"
-    - "expected/web/index.html"
-  - 
-    - "path=/web/index.rss"
-    - "expected/web/index.rss"
+    - expected.html