dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3678 from jekyll/minitest-5-6 

Merge pull request 3678
This commit is contained in:
Parker Moore 2015-04-29 10:35:40 -07:00
parent ee7f7baef2 6597bacee8
commit d3e867d4a0
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/step_definitions/jekyll_steps.rb
View File

@ -27,7 +27,9 @@ After do
Dir.chdir(File.dirname(TEST_DIR)) Dir.chdir(File.dirname(TEST_DIR))
end end
World(Minitest::Assertions) World do
MinitestWorld.new
end
Given /^I have a blank site in "(.*)"$/ do |path| Given /^I have a blank site in "(.*)"$/ do |path|
FileUtils.mkdir_p(path) unless File.exist?(path) FileUtils.mkdir_p(path) unless File.exist?(path)

11
features/support/env.rb
View File

@ -1,8 +1,17 @@
require 'fileutils' require 'fileutils'
require 'posix-spawn' require 'posix-spawn'
require 'minitest/assertions' require 'minitest/spec'
require 'time' require 'time'
class MinitestWorld
extend Minitest::Assertions
attr_accessor :assertions
def initialize
self.assertions = 0
end
end
JEKYLL_SOURCE_DIR = File.dirname(File.dirname(File.dirname(__FILE__))) JEKYLL_SOURCE_DIR = File.dirname(File.dirname(File.dirname(__FILE__)))
TEST_DIR = File.expand_path(File.join('..', '..', 'tmp', 'jekyll'), File.dirname(__FILE__)) TEST_DIR = File.expand_path(File.join('..', '..', 'tmp', 'jekyll'), File.dirname(__FILE__))
JEKYLL_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')) JEKYLL_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll'))