From 00a63f1c5a97c5e7f3408966554f85d752e45a74 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Mon, 18 Feb 2013 16:48:44 -0500 Subject: [PATCH] Rename some posts and fix wrong assumptions. --- t/podcast.t | 16 ++++++++-------- t/tinypodcast/index.mdwn | 1 - t/tinypodcast/{podcast.mdwn => pianopost.mdwn} | 0 t/tinypodcast/simple.mdwn | 1 + t/tinypodcast/{post.mdwn => simplepost.mdwn} | 0 5 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 t/tinypodcast/index.mdwn rename t/tinypodcast/{podcast.mdwn => pianopost.mdwn} (100%) create mode 100644 t/tinypodcast/simple.mdwn rename t/tinypodcast/{post.mdwn => simplepost.mdwn} (100%) 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/podcast.mdwn b/t/tinypodcast/pianopost.mdwn similarity index 100% rename from t/tinypodcast/podcast.mdwn rename to t/tinypodcast/pianopost.mdwn 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/post.mdwn b/t/tinypodcast/simplepost.mdwn similarity index 100% rename from t/tinypodcast/post.mdwn rename to t/tinypodcast/simplepost.mdwn -- 2.39.5