Merge branch 'master' into master

This commit is contained in:
Kyle Niewiada 2017-01-30 10:38:18 -05:00 committed by GitHub
commit 987e1ea81c
3 changed files with 10 additions and 10 deletions

View File

@ -30,7 +30,7 @@ module Jekyll
def options
{
"version" => Jekyll::SeoTag::VERSION,
"title" => title?
"title" => title?,
}
end
@ -39,7 +39,7 @@ module Jekyll
"page" => context.registers[:page],
"site" => context.registers[:site].site_payload["site"],
"paginator" => context["paginator"],
"seo_tag" => options
"seo_tag" => options,
}
end
@ -50,7 +50,7 @@ module Jekyll
def info
{
:registers => context.registers,
:filters => [Jekyll::Filters]
:filters => [Jekyll::Filters],
}
end

View File

@ -29,7 +29,7 @@ describe Jekyll::SeoTag do
site.process
options = {
:check_html => true,
:checks_to_ignore => %w(ScriptCheck LinkCheck ImageCheck)
:checks_to_ignore => %w(ScriptCheck LinkCheck ImageCheck),
}
status = HTML::Proofer.new(dest_dir, options).run
expect(status).to eql(true)
@ -279,7 +279,7 @@ EOS
{
"title" => "post",
"description" => "description",
"image" => "/img.png"
"image" => "/img.png",
}
end
let(:page) { make_post(meta) }
@ -309,7 +309,7 @@ EOS
{
"admins" => "jekyllrb-fb-admins",
"app_id" => "jekyllrb-fb-app_id",
"publisher" => "jekyllrb-fb-publisher"
"publisher" => "jekyllrb-fb-publisher",
}
end
@ -431,8 +431,8 @@ EOS
{
"permalink" => "/",
"seo" => {
"type" => "person"
}
"type" => "person",
},
}
end
@ -502,7 +502,7 @@ EOS
"google" => "foo",
"bing" => "bar",
"alexa" => "baz",
"yandex" => "bat"
"yandex" => "bat",
}
end

View File

@ -16,7 +16,7 @@ end
CONFIG_DEFAULTS = {
"source" => source_dir,
"destination" => dest_dir,
"gems" => ["jekyll-seo-tag"]
"gems" => ["jekyll-seo-tag"],
}.freeze
def make_page(options = {})