From aad587ca2f924895bd434c6c8bcc53110d9cb5be Mon Sep 17 00:00:00 2001 From: Brint O'Hearn Date: Sun, 15 May 2016 19:20:29 -0500 Subject: [PATCH] Rubocop fixes for test/helper.rb --- .rubocop.yml | 1 - test/helper.rb | 44 ++++++++++++++++++++------------------------ 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index acdd1022..fc8fcb6c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -70,7 +70,6 @@ AllCops: - features/step_definitions.rb - features/support/formatter.rb - features/support/helpers.rb - - test/helper.rb - test/simplecov_custom_profile.rb - test/test_configuration.rb - test/test_convertible.rb diff --git a/test/helper.rb b/test/helper.rb index ade8b77d..3a3dafa2 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -6,7 +6,7 @@ $stdout.puts "# -------------------------------------------------------------" $VERBOSE = nil def jruby? - defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' + defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" end if ENV["CI"] @@ -22,23 +22,23 @@ else end require "nokogiri" -require 'rubygems' -require 'ostruct' -require 'minitest/autorun' -require 'minitest/reporters' -require 'minitest/profile' -require 'rspec/mocks' -require 'jekyll' +require "rubygems" +require "ostruct" +require "minitest/autorun" +require "minitest/reporters" +require "minitest/profile" +require "rspec/mocks" +require "jekyll" Jekyll.logger = Logger.new(StringIO.new) unless jruby? - require 'rdiscount' - require 'redcarpet' + require "rdiscount" + require "redcarpet" end -require 'kramdown' -require 'shoulda' +require "kramdown" +require "shoulda" include Jekyll @@ -51,16 +51,12 @@ Minitest::Reporters.use! [ module Minitest::Assertions def assert_exist(filename, msg = nil) - msg = message(msg) { - "Expected '#{filename}' to exist" - } + msg = message(msg) { "Expected '#{filename}' to exist" } assert File.exist?(filename), msg end def refute_exist(filename, msg = nil) - msg = message(msg) { - "Expected '#{filename}' not to exist" - } + msg = message(msg) { "Expected '#{filename}' not to exist" } refute File.exist?(filename), msg end end @@ -69,8 +65,8 @@ class JekyllUnitTest < Minitest::Test include ::RSpec::Mocks::ExampleMethods def mocks_expect(*args) - RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect).\ - bind(self).call(*args) + RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect)\ + .bind(self).call(*args) end def before_setup @@ -105,16 +101,16 @@ class JekyllUnitTest < Minitest::Test end def dest_dir(*subdirs) - test_dir('dest', *subdirs) + test_dir("dest", *subdirs) end def source_dir(*subdirs) - test_dir('source', *subdirs) + test_dir("source", *subdirs) end def clear_dest FileUtils.rm_rf(dest_dir) - FileUtils.rm_rf(source_dir('.jekyll-metadata')) + FileUtils.rm_rf(source_dir(".jekyll-metadata")) end def test_dir(*subdirs) @@ -124,7 +120,7 @@ class JekyllUnitTest < Minitest::Test def directory_with_contents(path) FileUtils.rm_rf(path) FileUtils.mkdir(path) - File.open("#{path}/index.html", "w"){ |f| f.write("I was previously generated.") } + File.open("#{path}/index.html", "w") { |f| f.write("I was previously generated.") } end def with_env(key, value)