From 0c79a474a700cc5ec4f923ebdda8473b7cc7c5c5 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Fri, 24 Jul 2015 09:15:57 +0200 Subject: [PATCH] Moved simplecov_setup into lib folder As simplecov_setup is a runtime dependency of the cucumber bin script it should not be placed into spec/ folder as there should be only test parts be placed. The old code bites us at SUSE as all tests are split into a testsuite package which results in a currently broken cucumber. --- bin/cucumber | 3 +-- {spec => lib}/simplecov_setup.rb | 0 spec/spec_helper.rb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename {spec => lib}/simplecov_setup.rb (100%) diff --git a/bin/cucumber b/bin/cucumber index 017893bde7..dffa388389 100755 --- a/bin/cucumber +++ b/bin/cucumber @@ -1,8 +1,7 @@ #!/usr/bin/env ruby $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib') -load File.expand_path(File.dirname(__FILE__) + '/../spec/simplecov_setup.rb') - +require 'simplecov_setup' require 'cucumber/rspec/disable_option_parser' require 'cucumber/cli/main' # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn. diff --git a/spec/simplecov_setup.rb b/lib/simplecov_setup.rb similarity index 100% rename from spec/simplecov_setup.rb rename to lib/simplecov_setup.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2c395631e8..6a7da7c84d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,7 @@ # For Travis.... require 'cucumber/encoding' -load File.expand_path(File.dirname(__FILE__) + '/../spec/simplecov_setup.rb') +require 'simplecov_setup' require 'pry'