Merge branch 'master' into sihil-dec-string-multiline

kyledecot · Feb 19, 2014 · adc34a1 · adc34a1
2 parents fa62c1e + c1c623e
commit adc34a1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -1,4 +1,6 @@
-ENV['RUBYLIB'] = File.dirname(__FILE__) + '/../../lib'
+rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
+rubylib.unshift %|#{File.dirname(__FILE__) + '/../../lib'}|
+ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
 require 'rubygems'
 require 'aruba/config'
 require 'aruba/cucumber'