From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Mon, 18 Feb 2013 21:48:44 +0000 (-0500)
Subject: Rename some posts and fix wrong assumptions.
X-Git-Tag: 3.20130904~88^2~26
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/00a63f1c5a97c5e7f3408966554f85d752e45a74?hp=cc0d875507671498e7cf9cd782357d32dbd88f66

Rename some posts and fix wrong assumptions.
---

diff --git a/t/podcast.t b/t/podcast.t
index a50b7ff2a..77f146871 100755
--- a/t/podcast.t
+++ b/t/podcast.t
@@ -27,25 +27,25 @@ sub simple_podcast {
 	ok(! system(@command));
 
 	my %media_types = (
-		'post'		=> undef,
+		'simplepost'	=> undef,
 		'piano.mp3'	=> 'audio/mpeg',
 		'scroll.3gp'	=> 'video/3gpp',
 		'walter.ogg'	=> 'video/x-theora+ogg',
 	);
 
 	for my $format (qw(atom rss)) {
-		my $feed = XML::Feed->parse("$tmp/out/index.$format");
+		my $feed = XML::Feed->parse("$tmp/out/simple/index.$format");
 
-		is($feed->title, 'wiki',
+		is($feed->title, 'simple',
 			qq{$format feed title});
-		is($feed->link, "$baseurl/",
+		is($feed->link, "$baseurl/simple/",
 			qq{$format feed link});
-		is($feed->description, $feed->title,
+		is($feed->description, 'wiki',
 			qq{$format feed description});
 		if ('atom' eq $format) {
-			is($feed->author, $feed->title,
+			is($feed->author, $feed->description,
 				qq{$format feed author});
-			is($feed->id, "$baseurl/",
+			is($feed->id, $feed->link,
 				qq{$format feed id});
 			is($feed->generator, "ikiwiki",
 				qq{$format feed generator});
@@ -97,7 +97,7 @@ sub single_page_html {
 
 	ok(! system("mkdir $tmp"));
 	ok(! system(@command));
-	my $html = "$tmp/out/podcast/index.html";
+	my $html = "$tmp/out/pianopost/index.html";
 
 	my $body = _extract_html_content($html, 'content');
 	like($body, qr/article has content and/m, q{html body text});
diff --git a/t/tinypodcast/index.mdwn b/t/tinypodcast/index.mdwn
deleted file mode 100644
index 530f7516c..000000000
--- a/t/tinypodcast/index.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-[[!inline pages="post or *.3gp or *.mov or *.mp3 or *.ogg" rss=yes atom=yes]]
diff --git a/t/tinypodcast/pianopost.mdwn b/t/tinypodcast/pianopost.mdwn
new file mode 100644
index 000000000..b02f8dee0
--- /dev/null
+++ b/t/tinypodcast/pianopost.mdwn
@@ -0,0 +1,3 @@
+[[!meta enclosure="piano.mp3"]]
+
+this article has content _and_ an enclosure!
diff --git a/t/tinypodcast/podcast.mdwn b/t/tinypodcast/podcast.mdwn
deleted file mode 100644
index b02f8dee0..000000000
--- a/t/tinypodcast/podcast.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta enclosure="piano.mp3"]]
-
-this article has content _and_ an enclosure!
diff --git a/t/tinypodcast/post.mdwn b/t/tinypodcast/post.mdwn
deleted file mode 100644
index d28ddb524..000000000
--- a/t/tinypodcast/post.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-this article has content but no enclosure
diff --git a/t/tinypodcast/simple.mdwn b/t/tinypodcast/simple.mdwn
new file mode 100644
index 000000000..02988fa17
--- /dev/null
+++ b/t/tinypodcast/simple.mdwn
@@ -0,0 +1 @@
+[[!inline pages="simplepost or *.3gp or *.mov or *.mp3 or *.ogg" rss=yes atom=yes]]
diff --git a/t/tinypodcast/simplepost.mdwn b/t/tinypodcast/simplepost.mdwn
new file mode 100644
index 000000000..d28ddb524
--- /dev/null
+++ b/t/tinypodcast/simplepost.mdwn
@@ -0,0 +1 @@
+this article has content but no enclosure