unittests/setup.rb in firewatir-1.6.6 vs unittests/setup.rb in firewatir-1.6.7.rc1
- old
+ new
@@ -3,10 +3,10 @@
$myDir = File.expand_path(File.dirname(__FILE__))
topdir = File.join(File.dirname(__FILE__), '..')
$firewatir_dev_lib = File.join(topdir, 'lib')
$watir_dev_lib = File.join(topdir, '..', 'watir', 'lib')
-commonwatir_dir = "commonwatir-#{File.read("VERSION").strip}" rescue "commonwatir"
+commonwatir_dir = "commonwatir#{File.exist?('VERSION') ? "-#{File.read('VERSION').strip}" : ""}"
libs = []
libs << File.join(topdir, '..', commonwatir_dir, 'lib')
libs << File.join(topdir, '..', commonwatir_dir) # for the unit tests
libs.each { |lib| $LOAD_PATH.unshift File.expand_path(lib) }