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/support/formatter.rb
- features/support/helpers.rb
- test/helper.rb
- test/simplecov_custom_profile.rb
- test/test_configuration.rb
- test/test_convertible.rb

View File

@ -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)