something really simple
", @filter.textilize("something *really* simple") - end + context "filters" do + setup do + @filter = JekyllFilter.new + end - def test_array_to_sentence_string_with_no_args - assert_equal "", @filter.array_to_sentence_string([]) - end + should "textilize with simple string" do + assert_equal "something really simple
", @filter.textilize("something *really* simple") + end - def test_array_to_sentence_string_with_one_arg - assert_equal "1", @filter.array_to_sentence_string([1]) - assert_equal "chunky", @filter.array_to_sentence_string(["chunky"]) + should "convert array to sentence string with no args" do + assert_equal "", @filter.array_to_sentence_string([]) + end + + should "convert array to sentence string with one arg" do + assert_equal "1", @filter.array_to_sentence_string([1]) + assert_equal "chunky", @filter.array_to_sentence_string(["chunky"]) + end + + should "convert array to sentence string with two args" do + assert_equal "1 and 2", @filter.array_to_sentence_string([1, 2]) + assert_equal "chunky and bacon", @filter.array_to_sentence_string(["chunky", "bacon"]) + end + + should "convert array to sentence string with multiple args" do + assert_equal "1, 2, 3, and 4", @filter.array_to_sentence_string([1, 2, 3, 4]) + assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"]) + end + + should "escape xml with ampersands" do + assert_equal "AT&T", @filter.xml_escape("AT&T") + assert_equal "<code>command <filename></code>", @filter.xml_escape("command <filename>")
+ end
end
-
- def test_array_to_sentence_string_with_two_args
- assert_equal "1 and 2", @filter.array_to_sentence_string([1, 2])
- assert_equal "chunky and bacon", @filter.array_to_sentence_string(["chunky", "bacon"])
- end
-
- def test_array_to_sentence_string_with_multiple_args
- assert_equal "1, 2, 3, and 4", @filter.array_to_sentence_string([1, 2, 3, 4])
- assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"])
- end
-
- def test_xml_escape_with_ampersands
- assert_equal "AT&T", @filter.xml_escape("AT&T")
- assert_equal "<code>command <filename></code>", @filter.xml_escape("command <filename>")
- end
-
end
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 4486eb9c..ae858169 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -1,38 +1,36 @@
require File.dirname(__FILE__) + '/helper'
class TestGeneratedSite < Test::Unit::TestCase
- def setup
- clear_dest
- @config = Jekyll::DEFAULTS.clone
- @config['source'] = File.join(File.dirname(__FILE__), *%w[source])
- @config['destination'] = dest_dir
- Jekyll.configure(@config)
- @s = Site.new(@config)
- @s.process
- @index = File.read(File.join(dest_dir, 'index.html'))
- end
-
- def test_site_posts_in_index
- # confirm that {{ site.posts }} is working
- assert @index.include?("#{@s.posts.size} Posts")
- end
+ context "generated sites" do
+ setup do
+ clear_dest
+ @source = File.join(File.dirname(__FILE__), *%w[source])
+ @s = Site.new(@source, dest_dir)
+ @s.process
+ @index = File.read(File.join(dest_dir, 'index.html'))
+ end
- def test_post_content_in_index
- # confirm that the {{ post.content }} is rendered OK
- latest_post = Dir[File.join(@config['source'], '_posts/*')].last
- post = Post.new(@config['source'], '', File.basename(latest_post))
- post.transform
- assert @index.include?(post.content)
- end
+ should "insert site.posts into the index" do
+ assert @index.include?("#{@s.posts.size} Posts")
+ end
- def test_unpublished_posts_are_hidden
- published = Dir[File.join(dest_dir, 'publish_test/2008/02/02/*.html')].map {|f| File.basename(f)}
-
- assert_equal 1, published.size
- assert_equal "published.html", published.first
- end
+ should "render post.content" do
+ latest_post = Dir[File.join(@source, '_posts/*')].last
+ post = Post.new(@source, '', File.basename(latest_post))
+ Jekyll.content_type = post.determine_content_type
+ post.transform
+ assert @index.include?(post.content)
+ end
- def test_posts_directory_not_copied
- assert !File.exist?(File.join(dest_dir, '_posts'))
+ should "hide unpublished posts" do
+ published = Dir[File.join(dest_dir, 'publish_test/2008/02/02/*.html')].map {|f| File.basename(f)}
+
+ assert_equal 1, published.size
+ assert_equal "published.html", published.first
+ end
+
+ should "not copy _posts directory" do
+ assert !File.exist?(File.join(dest_dir, '_posts'))
+ end
end
end
diff --git a/test/test_jekyll.rb b/test/test_jekyll.rb
deleted file mode 100644
index e69de29b..00000000
diff --git a/test/test_post.rb b/test/test_post.rb
index c9c268d8..e92618f8 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -1,144 +1,135 @@
require File.dirname(__FILE__) + '/helper'
class TestPost < Test::Unit::TestCase
- def setup
- Jekyll.configure(Jekyll::DEFAULTS)
- end
-
- def test_valid
+ should "ensure valid posts are valid" do
assert Post.valid?("2008-10-19-foo-bar.textile")
assert Post.valid?("foo/bar/2008-10-19-foo-bar.textile")
-
+
assert !Post.valid?("lol2008-10-19-foo-bar.textile")
assert !Post.valid?("blah")
end
-
- def test_process
- p = Post.allocate
- p.process("2008-10-19-foo-bar.textile")
-
- assert_equal Time.parse("2008-10-19"), p.date
- assert_equal "foo-bar", p.slug
- assert_equal ".textile", p.ext
- end
-
- def test_url
- p = Post.allocate
- p.categories = []
- p.process("2008-10-19-foo-bar.textile")
-
- assert_equal "/2008/10/19/foo-bar.html", p.url
- end
-
- def test_permalink
- p = Post.allocate
- p.process("2008-12-03-permalinked-post.textile")
- p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-03-permalinked-post.textile")
- assert_equal "my_category/permalinked-post", p.permalink
- end
+ context "processing posts" do
+ setup do
+ @post = Post.allocate
+ @real_file = "2008-10-18-foo-bar.textile"
+ @fake_file = "2008-10-19-foo-bar.textile"
+ @source = File.join(File.dirname(__FILE__), *%w[source _posts])
+ end
- def test_dir_respects_permalink
- p = Post.allocate
- p.process("2008-12-03-permalinked-post.textile")
- p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-03-permalinked-post.textile")
+ should "keep date, title, and markup type" do
+ @post.process(@fake_file)
- assert_equal "my_category/", p.dir
- end
-
- def test_url_respects_permalink
- p = Post.allocate
- p.process("2008-12-03-permalinked-post.textile")
- p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-03-permalinked-post.textile")
+ assert_equal Time.parse("2008-10-19"), @post.date
+ assert_equal "foo-bar", @post.slug
+ assert_equal ".textile", @post.ext
+ end
- assert_equal "my_category/permalinked-post", p.url
- end
+ should "create url based on date and title" do
+ @post.categories = []
+ @post.process(@fake_file)
+ assert_equal "/2008/10/19/foo-bar.html", @post.url
+ end
- def test_read_yaml
- p = Post.allocate
- p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")
-
- assert_equal({"title" => "Foo Bar", "layout" => "default"}, p.data)
- assert_equal "\nh1. {{ page.title }}\n\nBest *post* ever", p.content
- end
-
- def test_transform
- p = Post.allocate
- p.process("2008-10-18-foo-bar.textile")
- p.read_yaml(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-10-18-foo-bar.textile")
- p.transform
-
- assert_equal "Best post ever
", p.content - end + should "respect permalink" do + file = "2008-12-03-permalinked-post.textile" + @post.process(file) + @post.read_yaml(@source, file) - def test_published - p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-02-02-published.textile") - assert_equal true, p.published - end + assert_equal "my_category/permalinked-post", @post.permalink + assert_equal "my_category/", @post.dir + assert_equal "my_category/permalinked-post", @post.url + end - def test_not_published - p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-02-02-not-published.textile") - assert_equal false, p.published - end + should "read yaml front-matter" do + @post.read_yaml(@source, @real_file) - def test_yaml_category - p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2009-01-27-category.textile") - assert p.categories.include?('foo') - end + assert_equal({"title" => "Foo Bar", "layout" => "default"}, @post.data) + assert_equal "\nh1. {{ page.title }}\n\nBest *post* ever", @post.content + end - def test_yaml_categories - p1 = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', - "2009-01-27-categories.textile") - p2 = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', - "2009-01-27-array-categories.textile") - - [p1, p2].each do |p| - assert p.categories.include?('foo') - assert p.categories.include?('bar') - assert p.categories.include?('baz') + should "transform textile" do + @post.process(@real_file) + @post.read_yaml(@source, @real_file) + @post.transform + + assert_equal "Best post ever
", @post.content end end - - def test_render - p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-10-18-foo-bar.textile") - layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")} - p.render(layouts, {"site" => {"posts" => []}}) - - assert_equal "<<<Best post ever
>>>", p.output - end - - def test_write - clear_dest - - p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-10-18-foo-bar.textile") - layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")} - p.render(layouts, {"site" => {"posts" => []}}) - p.write(dest_dir) - end - - def test_data - p = Post.new(File.join(File.dirname(__FILE__), *%w[source]), '', "2008-11-21-complex.textile") - layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")} - p.render(layouts, {"site" => {"posts" => []}}) - - assert_equal "<<<url: /2008/11/21/complex.html
\ndate: #{Time.parse("2008-11-21")}
\nid: /2008/11/21/complex
Tom Preston-Werner github.com/mojombo
\n\nThis is cool
>>>", p.output + context "initializing posts" do + setup do + @setup_post = lambda do |file| + Post.new(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") + 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") + assert_equal false, post.published + end + + should "recognize category in yaml" do + post = @setup_post.call("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") + assert post.categories.include?('foo') + assert post.categories.include?('bar') + assert post.categories.include?('baz') + end + + context "rendering" do + setup do + clear_dest + @render = lambda do |post| + layouts = {"default" => Layout.new(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) + assert_equal "<<<Best post ever
>>>", post.output + end + + should "write properly" do + post = @setup_post.call("2008-10-18-foo-bar.textile") + @render.call(post) + post.write(dest_dir) + + assert File.directory?(dest_dir) + assert File.exists?(File.join(dest_dir, '2008', '10', '18', 'foo-bar.html')) + end + + should "insert data" do + post = @setup_post.call("2008-11-21-complex.textile") + @render.call(post) + + assert_equal "<<<url: /2008/11/21/complex.html
\ndate: #{Time.parse("2008-11-21")}
\nid: /2008/11/21/complex
Tom Preston-Werner github.com/mojombo
\n\nThis is cool
>>>", post.output + end + end + end + + should "generate categories and topics" do + post = Post.new(File.join(File.dirname(__FILE__), *%w[source]), 'foo', 'bar/2008-12-12-topical-post.textile') + assert_equal ['foo'], post.categories + assert_equal ['bar'], post.topics end end diff --git a/test/test_site.rb b/test/test_site.rb index 447a8d7c..b19a8e86 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -1,48 +1,42 @@ require File.dirname(__FILE__) + '/helper' class TestSite < Test::Unit::TestCase - def setup - @config = Jekyll::DEFAULTS.clone - @config['source'] = File.join(File.dirname(__FILE__), *%w[source]) - @config['destination'] = dest_dir - Jekyll.configure(@config) - @s = Site.new(@config) - end - - def test_site_init - - end - - def test_read_layouts - @s.read_layouts - - assert_equal ["default", "simple"].sort, @s.layouts.keys.sort - end - - def test_read_posts - @s.read_posts('') - posts = Dir[File.join(@config['source'], '_posts/*')] - assert_equal posts.size - 1, @s.posts.size - end - - def test_site_payload - clear_dest - @s.process - - posts = Dir[File.join(@config['source'], "**", "_posts/*")] - categories = %w(bar baz category foo z_category publish_test).sort + context "creating sites" do + setup do + @source = File.join(File.dirname(__FILE__), 'source') + @s = Site.new(@source, dest_dir) + end - assert_equal posts.size - 1, @s.posts.size - assert_equal categories, @s.categories.keys.sort - assert_equal 4, @s.categories['foo'].size - end + should "read layouts" do + @s.read_layouts + assert_equal ["default", "simple"].sort, @s.layouts.keys.sort + end - def test_filter_entries - ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown# - .baz.markdow foo.markdown~] - ent2 = %w[.htaccess _posts bla.bla] + should "read posts" do + @s.read_posts('') + posts = Dir[File.join(@source, '_posts/*')] + assert_equal posts.size - 1, @s.posts.size + end - assert_equal %w[foo.markdown bar.markdown baz.markdown], @s.filter_entries(ent1) - assert_equal ent2, @s.filter_entries(ent2) + should "deploy payload" do + clear_dest + @s.process + + posts = Dir[File.join(@source, "**", "_posts/*")] + categories = %w(bar baz category foo z_category publish_test).sort + + assert_equal posts.size - 1, @s.posts.size + assert_equal categories, @s.categories.keys.sort + assert_equal 3, @s.categories['foo'].size + end + + should "filter entries" do + ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown# + .baz.markdow foo.markdown~] + ent2 = %w[.htaccess _posts bla.bla] + + assert_equal %w[foo.markdown bar.markdown baz.markdown], @s.filter_entries(ent1) + assert_equal ent2, @s.filter_entries(ent2) + end end end diff --git a/test/test_tags.rb b/test/test_tags.rb index d2a4c87c..e400b469 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -1,9 +1,9 @@ require File.dirname(__FILE__) + '/helper' class TestTags < Test::Unit::TestCase - - def setup - @content = <