From 1423ea91a02fbb88128a97a72b73c04030505893 Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Tue, 17 Mar 2009 22:41:23 -0400 Subject: [PATCH] Removing lambdas from test_post since that was just stupid --- test/test_post.rb | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/test/test_post.rb b/test/test_post.rb index 0d901d3a..4d8303ec 100644 --- a/test/test_post.rb +++ b/test/test_post.rb @@ -1,6 +1,15 @@ require File.dirname(__FILE__) + '/helper' class TestPost < Test::Unit::TestCase + def setup_post(file) + Post.new(@site, File.join(File.dirname(__FILE__), *%w[source]), '', file) + end + + def do_render(post) + layouts = {"default" => Layout.new(@site, File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")} + post.render(layouts, {"site" => {"posts" => []}}) + end + context "A Post" do setup do clear_dest @@ -68,29 +77,23 @@ class TestPost < Test::Unit::TestCase end context "initializing posts" do - setup do - @setup_post = lambda do |file| - Post.new(@site, File.join(File.dirname(__FILE__), *%w[source]), '', file) - end - end - should "publish when published yaml is no specified" do - post = @setup_post.call("2008-02-02-published.textile") + post = setup_post("2008-02-02-published.textile") assert_equal true, post.published end should "not published when published yaml is false" do - post = @setup_post.call("2008-02-02-not-published.textile") + post = setup_post("2008-02-02-not-published.textile") assert_equal false, post.published end should "recognize category in yaml" do - post = @setup_post.call("2009-01-27-category.textile") + post = setup_post("2009-01-27-category.textile") assert post.categories.include?('foo') end should "recognize several categories in yaml" do - post = @setup_post.call("2009-01-27-categories.textile") + post = setup_post("2009-01-27-categories.textile") assert post.categories.include?('foo') assert post.categories.include?('bar') assert post.categories.include?('baz') @@ -99,21 +102,17 @@ class TestPost < Test::Unit::TestCase context "rendering" do setup do clear_dest - @render = lambda do |post| - layouts = {"default" => Layout.new(@site, File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")} - post.render(layouts, {"site" => {"posts" => []}}) - end end should "render properly" do - post = @setup_post.call("2008-10-18-foo-bar.textile") - @render.call(post) + post = setup_post("2008-10-18-foo-bar.textile") + do_render(post) assert_equal "<<<

Foo Bar

\n

Best post ever

>>>", post.output end should "write properly" do - post = @setup_post.call("2008-10-18-foo-bar.textile") - @render.call(post) + post = setup_post("2008-10-18-foo-bar.textile") + do_render(post) post.write(dest_dir) assert File.directory?(dest_dir) @@ -121,18 +120,17 @@ class TestPost < Test::Unit::TestCase end should "insert data" do - post = @setup_post.call("2008-11-21-complex.textile") - @render.call(post) + post = setup_post("2008-11-21-complex.textile") + do_render(post) assert_equal "<<<

url: /2008/11/21/complex.html
\ndate: #{Time.parse("2008-11-21")}
\nid: /2008/11/21/complex

>>>", post.output end should_eventually "include templates" do - post = @setup_post.call("2008-12-13-include.markdown") + post = setup_post("2008-12-13-include.markdown") post.site.source = File.join(File.dirname(__FILE__), 'source') - @render.call(post) + do_render(post) - require 'ruby-debug'; breakpoint assert_equal "<<<
\n

Tom Preston-Werner github.com/mojombo

\n\n

This is cool

>>>", post.output end end