dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP – fixing tests.

This commit is contained in:
Parker Moore 2013-06-09 18:06:28 +02:00
parent bd0e45c1b9
commit 81a2d03e58
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jekyll/generators/pagination.rb
View File

@ -50,7 +50,11 @@ module Jekyll
#
# Returns the url of the template page
def self.first_page_url(site)
Pagination.new.template_page(site).url
if page = Pagination.new.template_page(site)
page.url
else
nil
end
end
# Public: Find the Jekyll::Page which will act as the pager template

19
test/test_pager.rb
View File

@ -2,6 +2,15 @@ require 'helper'
class TestPager < Test::Unit::TestCase
def jekyll_site(config = {})
base = Jekyll::Configuration::DEFAULTS.merge({
'source' => source_dir,
'destination' => dest_dir,
'paginate' => 1
})
Jekyll::Site.new(base.merge(config))
end
should "calculate number of pages" do
assert_equal(0, Pager.calculate_pages([], '2'))
assert_equal(1, Pager.calculate_pages([1], '2'))
@ -12,10 +21,12 @@ class TestPager < Test::Unit::TestCase
end
should "determine the pagination path" do
assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 1))
assert_equal("page2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS, 2))
assert_nil(Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 1))
assert_equal("page-2", Pager.paginate_path(Jekyll::Configuration::DEFAULTS.merge('paginate_path' => '/blog/page-:num'), 2))
assert_equal("/index.html", Pager.paginate_path(jekyll_site, 1))
assert_equal("/page2", Pager.paginate_path(jekyll_site, 2))
assert_equal("/index.html", Pager.paginate_path(jekyll_site('paginate_path' => '/blog/page-:num'), 1))
assert_equal("/blog/page-2", Pager.paginate_path(jekyll_site('paginate_path' => '/blog/page-:num'), 2))
assert_equal("/index.html", Pager.paginate_path(jekyll_site('paginate_path' => '/blog/page/:num'), 1))
assert_equal("/blog/page/2", Pager.paginate_path(jekyll_site('paginate_path' => '/blog/page/:num'), 2))
end
context "pagination disabled" do