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.
allait · Jul 24, 2015 · 0c79a47 · 0c79a47
1 parent 925a673
commit 0c79a47
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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 → lib/simplecov_setup.rb b/spec/simplecov_setup.rb → lib/simplecov_setup.rb
diff --git 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'