aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-02-18 16:48:44 -0500
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-02-18 16:48:44 -0500
commit00a63f1c5a97c5e7f3408966554f85d752e45a74 (patch)
tree67d08a60961b78d26e6e33a3f883808b494a3c2e
parentcc0d875507671498e7cf9cd782357d32dbd88f66 (diff)
downloadikiwiki-00a63f1c5a97c5e7f3408966554f85d752e45a74.tar
ikiwiki-00a63f1c5a97c5e7f3408966554f85d752e45a74.tar.gz
Rename some posts and fix wrong assumptions.
-rwxr-xr-xt/podcast.t16
-rw-r--r--t/tinypodcast/index.mdwn1
-rw-r--r--t/tinypodcast/pianopost.mdwn (renamed from t/tinypodcast/podcast.mdwn)0
-rw-r--r--t/tinypodcast/simple.mdwn1
-rw-r--r--t/tinypodcast/simplepost.mdwn (renamed from t/tinypodcast/post.mdwn)0
5 files changed, 9 insertions, 9 deletions
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
index b02f8dee0..b02f8dee0 100644
--- a/t/tinypodcast/podcast.mdwn
+++ b/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
index d28ddb524..d28ddb524 100644
--- a/t/tinypodcast/post.mdwn
+++ b/t/tinypodcast/simplepost.mdwn