Merge pull request #4087 from XhmikosR/master

Trim trailing whitespace.
This commit is contained in:
Jordon Bedwell 2015-10-30 15:00:13 -05:00
commit 121a0471f2
2 changed files with 5 additions and 5 deletions

View File

@ -333,7 +333,7 @@ file, each document has the following attributes:
## Accessing Collection Attributes ## Accessing Collection Attributes
Attributes from the YAML front matter can be accessed as data anywhere in the Attributes from the YAML front matter can be accessed as data anywhere in the
site. Using the above example for configuring a collection as `site.albums`, site. Using the above example for configuring a collection as `site.albums`,
one might have front matter in an individual file structured as follows (which one might have front matter in an individual file structured as follows (which
must use a supported markup format, and cannot be saved with a `.yaml` must use a supported markup format, and cannot be saved with a `.yaml`

View File

@ -24,19 +24,19 @@ class TestLogAdapter < JekyllUnitTest
subject.adjust_verbosity(:quiet => true) subject.adjust_verbosity(:quiet => true)
assert_equal Jekyll::LogAdapter::LOG_LEVELS[:error], subject.writer.level assert_equal Jekyll::LogAdapter::LOG_LEVELS[:error], subject.writer.level
end end
should "set the writers logging level to debug when verbose" do should "set the writers logging level to debug when verbose" do
subject = Jekyll::LogAdapter.new(LoggerDouble.new) subject = Jekyll::LogAdapter.new(LoggerDouble.new)
subject.adjust_verbosity(:verbose => true) subject.adjust_verbosity(:verbose => true)
assert_equal Jekyll::LogAdapter::LOG_LEVELS[:debug], subject.writer.level assert_equal Jekyll::LogAdapter::LOG_LEVELS[:debug], subject.writer.level
end end
should "set the writers logging level to error when quiet and verbose are both set" do should "set the writers logging level to error when quiet and verbose are both set" do
subject = Jekyll::LogAdapter.new(LoggerDouble.new) subject = Jekyll::LogAdapter.new(LoggerDouble.new)
subject.adjust_verbosity(:quiet => true, :verbose => true) subject.adjust_verbosity(:quiet => true, :verbose => true)
assert_equal Jekyll::LogAdapter::LOG_LEVELS[:error], subject.writer.level assert_equal Jekyll::LogAdapter::LOG_LEVELS[:error], subject.writer.level
end end
should "not change the writer's logging level when neither verbose or quiet" do should "not change the writer's logging level when neither verbose or quiet" do
subject = Jekyll::LogAdapter.new(LoggerDouble.new) subject = Jekyll::LogAdapter.new(LoggerDouble.new)
original_level = subject.writer.level original_level = subject.writer.level
@ -45,7 +45,7 @@ class TestLogAdapter < JekyllUnitTest
subject.adjust_verbosity(:quiet => false, :verbose => false) subject.adjust_verbosity(:quiet => false, :verbose => false)
assert_equal original_level, subject.writer.level assert_equal original_level, subject.writer.level
end end
should "call #debug on writer return true" do should "call #debug on writer return true" do
writer = LoggerDouble.new writer = LoggerDouble.new
logger = Jekyll::LogAdapter.new(writer) logger = Jekyll::LogAdapter.new(writer)