+ The contents of <destination> are automatically
+ cleaned when the site is built. Files or folders that are not
+ created by your site will be removed. Do not use an important
+ location for <destination>; instead, use it as
+ a staging area and copy files from there to your web server.
+
First paragraph with link ref.
", @extracted_excerpt.content + assert_equal "First paragraph with link ref.
\n\n", @extracted_excerpt.content end should "link properly" do diff --git a/test/test_filters.rb b/test/test_filters.rb index a1cec1c7..1959e6f9 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -28,7 +28,7 @@ class TestFilters < Test::Unit::TestCase end should "markdownify with simple string" do - assert_equal "something really simple
", @filter.markdownify("something **really** simple") + assert_equal "something really simple
\n", @filter.markdownify("something **really** simple") end should "convert array to sentence string with no args" do @@ -131,7 +131,7 @@ class TestFilters < Test::Unit::TestCase assert_equal 2, g["items"].size when "" assert g["items"].is_a?(Array), "The list of grouped items for '' is not an Array." - assert_equal 7, g["items"].size + assert_equal 9, g["items"].size end end end diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb new file mode 100644 index 00000000..eead655a --- /dev/null +++ b/test/test_layout_reader.rb @@ -0,0 +1,17 @@ +require 'helper' + +class TestLayoutReader < Test::Unit::TestCase + context "reading layouts" do + setup do + stub(Jekyll).configuration do + Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) + end + @site = Site.new(Jekyll.configuration) + end + + should "read layouts" do + layouts = LayoutReader.new(@site).read + assert_equal ["default", "simple", "post/simple"].sort, layouts.keys.sort + end + end +end diff --git a/test/test_post.rb b/test/test_post.rb index 66ca7e45..7d4ab599 100644 --- a/test/test_post.rb +++ b/test/test_post.rb @@ -38,7 +38,7 @@ class TestPost < Test::Unit::TestCase id: "/foo/bar/baz/2013/12/20/properties", layout: 'default', name: nil, - # path: "properties.html", + path: "_posts/2013-12-20-properties.text", permalink: nil, published: nil, tags: %w(ay bee cee), @@ -323,7 +323,7 @@ class TestPost < Test::Unit::TestCase end should "return rendered HTML" do - assert_equal "First paragraph with link ref.
", + assert_equal "First paragraph with link ref.
\n\n", @post.excerpt end @@ -543,7 +543,7 @@ class TestPost < Test::Unit::TestCase post.site.source = File.join(File.dirname(__FILE__), 'source') do_render(post) - assert_equal "<<<Tom Preston-Werner github.com/mojombo
\n\nThis is cool
>>>", post.output + assert_equal "<<<Tom Preston-Werner\ngithub.com/mojombo
\n\nThis is cool
\n >>>", post.output end should "render date specified in front matter properly" do diff --git a/test/test_sass.rb b/test/test_sass.rb index d13fbcfe..0daa4f1d 100644 --- a/test/test_sass.rb +++ b/test/test_sass.rb @@ -104,4 +104,19 @@ CSS assert_equal css_output, converter.convert(scss_content) end end + + context "importing partials" do + setup do + @site = Jekyll::Site.new(Jekyll.configuration({ + "source" => source_dir, + "destination" => dest_dir + })) + @site.process + @test_css_file = dest_dir("css/main.css") + end + + should "import SCSS partial" do + assert_equal ".half {\n width: 50%; }\n", File.read(@test_css_file) + end + end end diff --git a/test/test_site.rb b/test/test_site.rb index 7dc78dbc..7e593c86 100644 --- a/test/test_site.rb +++ b/test/test_site.rb @@ -157,15 +157,11 @@ class TestSite < Test::Unit::TestCase should "sort pages alphabetically" do stub.proxy(Dir).entries { |entries| entries.reverse } @site.process - sorted_pages = %w(.htaccess about.html bar.html coffeescript.coffee contacts.html deal.with.dots.html exploit.md foo.md index.html index.html properties.html sitemap.xml symlinked-file) + # files in symlinked directories may appear twice + sorted_pages = %w(.htaccess about.html bar.html coffeescript.coffee contacts.html deal.with.dots.html exploit.md foo.md index.html index.html main.scss main.scss properties.html sitemap.xml symlinked-file) assert_equal sorted_pages, @site.pages.map(&:name) end - should "read layouts" do - @site.read_layouts - assert_equal ["default", "simple", "post/simple"].sort, @site.layouts.keys.sort - end - should "read posts" do @site.read_posts('') posts = Dir[source_dir('_posts', '**', '*')] diff --git a/test/test_tags.rb b/test/test_tags.rb index e6887ef6..d7c8df24 100644 --- a/test/test_tags.rb +++ b/test/test_tags.rb @@ -54,7 +54,7 @@ CONTENT end context "initialized tag" do - should "work" do + should "set the correct options" do tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby ', ["test", "{% endhighlight %}", "\n"]) assert_equal({}, tag.instance_variable_get(:@options)) @@ -85,11 +85,11 @@ CONTENT end should "render markdown with pygments" do - assert_match %{test\ntest\n1 test\n1 test\n./jekyll.gemspec\n./jekyll.gemspec\nÆ\nÆ\nTom Preston-Werner github.com/mojombo
\n", @result + assert_match "Tom Preston-Werner\ngithub.com/mojombo
\n", @result end end @@ -465,7 +465,7 @@ CONTENT end should "not include previously used parameters" do - assert_match "", @result + assert_match "", @result end end @@ -482,7 +482,7 @@ CONTENT end should "include file with empty parameters" do - assert_match "", @result + assert_match "", @result end end @@ -499,7 +499,7 @@ CONTENT end should "include file with empty parameters within if statement" do - assert_match "", @result + assert_match "", @result end end @@ -512,6 +512,7 @@ puts "Hello world" ``` CONTENT create_post(content, { + 'markdown' => 'maruku', 'maruku' => {'fenced_code_blocks' => true}} ) end