Rubocop fixes for test/helper.rb

This commit is contained in:
Brint O'Hearn 2016-05-15 19:20:29 -05:00
parent 146d49dc8f
commit aad587ca2f
2 changed files with 20 additions and 25 deletions

View File

@ -70,7 +70,6 @@ AllCops:
- features/step_definitions.rb - features/step_definitions.rb
- features/support/formatter.rb - features/support/formatter.rb
- features/support/helpers.rb - features/support/helpers.rb
- test/helper.rb
- test/simplecov_custom_profile.rb - test/simplecov_custom_profile.rb
- test/test_configuration.rb - test/test_configuration.rb
- test/test_convertible.rb - test/test_convertible.rb

View File

@ -6,7 +6,7 @@ $stdout.puts "# -------------------------------------------------------------"
$VERBOSE = nil $VERBOSE = nil
def jruby? def jruby?
defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
end end
if ENV["CI"] if ENV["CI"]
@ -22,23 +22,23 @@ else
end end
require "nokogiri" require "nokogiri"
require 'rubygems' require "rubygems"
require 'ostruct' require "ostruct"
require 'minitest/autorun' require "minitest/autorun"
require 'minitest/reporters' require "minitest/reporters"
require 'minitest/profile' require "minitest/profile"
require 'rspec/mocks' require "rspec/mocks"
require 'jekyll' require "jekyll"
Jekyll.logger = Logger.new(StringIO.new) Jekyll.logger = Logger.new(StringIO.new)
unless jruby? unless jruby?
require 'rdiscount' require "rdiscount"
require 'redcarpet' require "redcarpet"
end end
require 'kramdown' require "kramdown"
require 'shoulda' require "shoulda"
include Jekyll include Jekyll
@ -51,16 +51,12 @@ Minitest::Reporters.use! [
module Minitest::Assertions module Minitest::Assertions
def assert_exist(filename, msg = nil) def assert_exist(filename, msg = nil)
msg = message(msg) { msg = message(msg) { "Expected '#{filename}' to exist" }
"Expected '#{filename}' to exist"
}
assert File.exist?(filename), msg assert File.exist?(filename), msg
end end
def refute_exist(filename, msg = nil) def refute_exist(filename, msg = nil)
msg = message(msg) { msg = message(msg) { "Expected '#{filename}' not to exist" }
"Expected '#{filename}' not to exist"
}
refute File.exist?(filename), msg refute File.exist?(filename), msg
end end
end end
@ -69,8 +65,8 @@ class JekyllUnitTest < Minitest::Test
include ::RSpec::Mocks::ExampleMethods include ::RSpec::Mocks::ExampleMethods
def mocks_expect(*args) def mocks_expect(*args)
RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect).\ RSpec::Mocks::ExampleMethods::ExpectHost.instance_method(:expect)\
bind(self).call(*args) .bind(self).call(*args)
end end
def before_setup def before_setup
@ -105,16 +101,16 @@ class JekyllUnitTest < Minitest::Test
end end
def dest_dir(*subdirs) def dest_dir(*subdirs)
test_dir('dest', *subdirs) test_dir("dest", *subdirs)
end end
def source_dir(*subdirs) def source_dir(*subdirs)
test_dir('source', *subdirs) test_dir("source", *subdirs)
end end
def clear_dest def clear_dest
FileUtils.rm_rf(dest_dir) FileUtils.rm_rf(dest_dir)
FileUtils.rm_rf(source_dir('.jekyll-metadata')) FileUtils.rm_rf(source_dir(".jekyll-metadata"))
end end
def test_dir(*subdirs) def test_dir(*subdirs)
@ -124,7 +120,7 @@ class JekyllUnitTest < Minitest::Test
def directory_with_contents(path) def directory_with_contents(path)
FileUtils.rm_rf(path) FileUtils.rm_rf(path)
FileUtils.mkdir(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 end
def with_env(key, value) def with_env(key, value)