From ad988838435de085cd90ca3a8ff285a74ef5eee2 Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 23:16:28 -0500 Subject: [PATCH] Rubocop fixes for test/test_log_adapter.rb --- .rubocop.yml | 1 - test/test_log_adapter.rb | 31 +++++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 66b68f47..e8b11102 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -76,7 +76,6 @@ AllCops: - test/test_filters.rb - test/test_kramdown.rb - test/test_liquid_renderer.rb - - test/test_log_adapter.rb - test/test_new_command.rb - test/test_page.rb - test/test_path_sanitization.rb diff --git a/test/test_log_adapter.rb b/test/test_log_adapter.rb index 0160d821..f34be99d 100644 --- a/test/test_log_adapter.rb +++ b/test/test_log_adapter.rb @@ -1,12 +1,15 @@ -require 'helper' +require "helper" class TestLogAdapter < JekyllUnitTest class LoggerDouble attr_accessor :level def debug(*); end + def info(*); end + def warn(*); end + def error(*); end end @@ -58,8 +61,9 @@ class TestLogAdapter < JekyllUnitTest should "call #debug on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:debug).with('topic '.rjust(20) + 'log message').and_return(true) - assert logger.debug('topic', 'log message') + allow(writer).to receive(:debug).with("topic ".rjust(20) + + "log message").and_return(true) + assert logger.debug("topic", "log message") end end @@ -67,8 +71,9 @@ class TestLogAdapter < JekyllUnitTest should "call #info on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:info).with('topic '.rjust(20) + 'log message').and_return(true) - assert logger.info('topic', 'log message') + allow(writer).to receive(:info).with("topic ".rjust(20) + + "log message").and_return(true) + assert logger.info("topic", "log message") end end @@ -76,8 +81,9 @@ class TestLogAdapter < JekyllUnitTest should "call #warn on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:warn).with('topic '.rjust(20) + 'log message').and_return(true) - assert logger.warn('topic', 'log message') + allow(writer).to receive(:warn).with("topic ".rjust(20) + + "log message").and_return(true) + assert logger.warn("topic", "log message") end end @@ -85,16 +91,17 @@ class TestLogAdapter < JekyllUnitTest should "call #error on writer return true" do writer = LoggerDouble.new logger = Jekyll::LogAdapter.new(writer) - allow(writer).to receive(:error).with('topic '.rjust(20) + 'log message').and_return(true) - assert logger.error('topic', 'log message') + allow(writer).to receive(:error).with("topic ".rjust(20) + + "log message").and_return(true) + assert logger.error("topic", "log message") end end context "#abort_with" do should "call #error and abort" do logger = Jekyll::LogAdapter.new(LoggerDouble.new) - allow(logger).to receive(:error).with('topic', 'log message').and_return(true) - assert_raises(SystemExit) { logger.abort_with('topic', 'log message') } + allow(logger).to receive(:error).with("topic", "log message").and_return(true) + assert_raises(SystemExit) { logger.abort_with("topic", "log message") } end end @@ -105,7 +112,7 @@ class TestLogAdapter < JekyllUnitTest should "store each log value in the array" do logger = Jekyll::LogAdapter.new(LoggerDouble.new) - values = %w{one two three four} + values = %w(one two three four) logger.debug(values[0]) logger.info(values[1]) logger.warn(values[2])