From 530ce2a574c715bda453282d8e7d657992c9f4bd Mon Sep 17 00:00:00 2001
From: Sylvester Keil <sylvester@keil.or.at>
Date: Sat, 12 Apr 2014 13:26:24 +0200
Subject: [PATCH] fix test dependencies

---
 Gemfile                                   |  3 ++-
 features/bibtex.feature                   |  1 -
 features/step_definitions/jekyll_steps.rb | 30 ++++++++---------------
 features/support/hooks.rb                 |  9 +++++++
 4 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 features/support/hooks.rb

diff --git a/Gemfile b/Gemfile
index 863b6b2..06b890e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,11 +2,12 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
+  gem 'minitest', '< 5.0'
   gem 'rake'
   gem 'redgreen', '~> 1.2'
   gem 'shoulda', '~> 3.5'
   gem 'rr', '~> 1.1'
-  gem 'cucumber', '~> 1.3'
+  gem 'cucumber', '=1.3.10'
   gem 'RedCloth', '~> 4.2'
   gem 'rdiscount', '~> 1.6'
   gem 'redcarpet', '~> 3.0'
diff --git a/features/bibtex.feature b/features/bibtex.feature
index 64d8354..b41be6d 100644
--- a/features/bibtex.feature
+++ b/features/bibtex.feature
@@ -24,7 +24,6 @@ Feature: BibTeX
     And the "_site/references.html" file should exist
     And I should see "<i>The Ruby Programming Language</i>" in "_site/references.html"
 
-  @converters
   Scenario: Markdown Formatted Bibliography
     Given I have a scholar configuration with:
       | key   | value |
diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 0237458..868e486 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -1,16 +1,6 @@
-Before do
-  FileUtils.rm_rf(TEST_DIR)
-  FileUtils.mkdir(TEST_DIR)
-  Dir.chdir(TEST_DIR)
-end
 
-After do
-  Dir.chdir(TEST_DIR)
-  FileUtils.rm_rf(TEST_DIR)
-end
- 
 # Like "I have a foo file" but gives a yaml front matter so jekyll actually processes it
-Given /^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/ do |file, key, value, text|
+Given(/^I have an? "(.*)" page(?: with (.*) "(.*)")? that contains "(.*)"$/) do |file, key, value, text|
   File.open(file, 'w') do |f|
     f.write <<EOF
 ---
@@ -22,21 +12,21 @@ EOF
   end
 end
 
-Given /^I have an? "(.*)" file that contains "(.*)"$/ do |file, text|
+Given(/^I have an? "(.*)" file that contains "(.*)"$/) do |file, text|
   File.open(file, 'w') do |f|
     f.write(text)
     f.close
   end
 end
 
-Given /^I have a configuration file with "(.*)" set to "(.*)"$/ do |key, value|
+Given(/^I have a configuration file with "(.*)" set to "(.*)"$/) do |key, value|
   File.open('_config.yml', 'w') do |f|
     f.write("#{key}: #{value}\n")
     f.close
   end
 end
 
-Given /^I have a configuration file with:$/ do |table|
+Given(/^I have a configuration file with:$/) do |table|
   File.open('_config.yml', 'w') do |f|
     table.hashes.each do |row|
       f.write("#{row["key"]}: #{row["value"]}\n")
@@ -45,28 +35,28 @@ Given /^I have a configuration file with:$/ do |table|
   end
 end
 
-When /^I run jekyll$/ do
+When(/^I run jekyll$/) do
   run_jekyll
 end
 
-Then /^the (.*) directory should exist$/ do |dir|
+Then(/^the (.*) directory should exist$/) do |dir|
   assert File.directory?(dir)
 end
 
-Then /^I should see "(.*)" in "(.*)"$/ do |text, file|
+Then(/^I should see "(.*)" in "(.*)"$/) do |text, file|
   puts File.open(file).readlines.join
   assert_match Regexp.new(text), File.open(file).readlines.join
 end
 
-Then /^I should not see "(.*)" in "(.*)"$/ do |text, file|
+Then(/^I should not see "(.*)" in "(.*)"$/) do |text, file|
   assert !File.open(file).readlines.join.match(Regexp.new(text))
 end
 
 
-Then /^the "(.*)" file should exist$/ do |file|
+Then(/^the "(.*)" file should exist$/) do |file|
   assert File.file?(file)
 end
 
-Then /^the "(.*)" file should not exist$/ do |file|
+Then(/^the "(.*)" file should not exist$/) do |file|
   assert !File.exists?(file)
 end
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
new file mode 100644
index 0000000..d7cc797
--- /dev/null
+++ b/features/support/hooks.rb
@@ -0,0 +1,9 @@
+Before do
+  FileUtils.mkdir_p(TEST_DIR) unless File.exist?(TEST_DIR)
+  Dir.chdir(TEST_DIR)
+end
+
+After do
+  FileUtils.rm_rf(TEST_DIR) if File.exist?(TEST_DIR)
+end
+
-- 
GitLab