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

Merge pull request #2155 from jekyll/fix-cucumber

This commit is contained in:
Matt Rogers 2014-03-18 23:07:39 -05:00
parent d3f12c84ad 53c42d000f
commit 04d38ad9c0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/step_definitions/jekyll_steps.rb
View File

@ -18,19 +18,19 @@ end
Before do Before do
FileUtils.mkdir(TEST_DIR) FileUtils.mkdir_p(TEST_DIR) unless File.exists?(TEST_DIR)
Dir.chdir(TEST_DIR) Dir.chdir(TEST_DIR)
end end
After do After do
FileUtils.rm_rf(TEST_DIR) FileUtils.rm_rf(TEST_DIR) if File.exists?(TEST_DIR)
FileUtils.rm_rf(JEKYLL_COMMAND_OUTPUT_FILE) FileUtils.rm(JEKYLL_COMMAND_OUTPUT_FILE)
end end
World(Test::Unit::Assertions) World(Test::Unit::Assertions)
Given /^I have a blank site in "(.*)"$/ do |path| Given /^I have a blank site in "(.*)"$/ do |path|
FileUtils.mkdir_p(path) FileUtils.mkdir_p(path) unless File.exists?(path)
end end
Given /^I do not have a "(.*)" directory$/ do |path| Given /^I do not have a "(.*)" directory$/ do |path|

4
features/support/env.rb
View File

@ -6,9 +6,9 @@ require 'rr'
require 'test/unit' require 'test/unit'
require 'time' require 'time'
TEST_DIR = File.join('/', 'tmp', 'jekyll') TEST_DIR = File.expand_path(File.join('..', '..', 'tmp', 'jekyll'), File.dirname(__FILE__))
JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll') JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')
JEKYLL_COMMAND_OUTPUT_FILE = File.join('/', 'tmp', 'jekyll_output.txt') JEKYLL_COMMAND_OUTPUT_FILE = File.join(File.dirname(TEST_DIR), 'jekyll_output.txt')
def jekyll_output_file def jekyll_output_file
JEKYLL_COMMAND_OUTPUT_FILE JEKYLL_COMMAND_OUTPUT_FILE

2
jekyll.gemspec
View File

@ -46,7 +46,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('redgreen', "~> 1.2") s.add_development_dependency('redgreen', "~> 1.2")
s.add_development_dependency('shoulda', "~> 3.5") s.add_development_dependency('shoulda', "~> 3.5")
s.add_development_dependency('rr', "~> 1.1") s.add_development_dependency('rr', "~> 1.1")
s.add_development_dependency('cucumber', "~> 1.3") s.add_development_dependency('cucumber', "1.3.11")
s.add_development_dependency('RedCloth', "~> 4.2") s.add_development_dependency('RedCloth', "~> 4.2")
s.add_development_dependency('kramdown', "~> 1.3") s.add_development_dependency('kramdown', "~> 1.3")
s.add_development_dependency('rdiscount', "~> 1.6") s.add_development_dependency('rdiscount', "~> 1.6")