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

Merge pull request #4288 from pathawks/calling-setter 

Wrap Arguments in () when used in a setter
This commit is contained in:
Parker Moore 2015-12-26 19:03:54 -05:00
parent cc5937815e a47ce7b655
commit fe690a8377
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/test_generated_site.rb
View File

@ -6,7 +6,7 @@ class TestGeneratedSite < JekyllUnitTest
clear_dest clear_dest
config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
@site = fixture_site config @site = fixture_site(config)
@site.process @site.process
@index = File.read(dest_dir('index.html')) @index = File.read(dest_dir('index.html'))
end end
@ -59,7 +59,7 @@ OUTPUT
setup do setup do
clear_dest clear_dest
config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5}) config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => 5})
@site = fixture_site config @site = fixture_site(config)
@site.process @site.process
@index = File.read(dest_dir('index.html')) @index = File.read(dest_dir('index.html'))
end end
@ -73,7 +73,7 @@ OUTPUT
clear_dest clear_dest
config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1}) config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'limit_posts' => -1})
@site = fixture_site config @site = fixture_site(config)
end end
end end

2
test/test_layout_reader.rb
View File

@ -4,7 +4,7 @@ class TestLayoutReader < JekyllUnitTest
context "reading layouts" do context "reading layouts" do
setup do setup do
config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) config = Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
@site = fixture_site config @site = fixture_site(config)
end end
should "read layouts" do should "read layouts" do

5
test/test_static_file.rb
View File

@ -19,12 +19,12 @@ class TestStaticFile < JekyllUnitTest
end end
def setup_static_file_with_collection(base, dir, name, label, metadata) def setup_static_file_with_collection(base, dir, name, label, metadata)
site = fixture_site 'collections' => {label => metadata} site = fixture_site('collections' => {label => metadata})
StaticFile.new(site, base, dir, name, site.collections[label]) StaticFile.new(site, base, dir, name, site.collections[label])
end end
def setup_static_file_with_defaults(base, dir, name, defaults) def setup_static_file_with_defaults(base, dir, name, defaults)
site = fixture_site 'defaults' => defaults site = fixture_site('defaults' => defaults)
StaticFile.new(site, base, dir, name) StaticFile.new(site, base, dir, name)
end end
@ -130,4 +130,3 @@ class TestStaticFile < JekyllUnitTest
end end
end end
end end