Merge pull request #165 from betelgeuse/cucumber_infra_improvements

Cucumber infra improvements
This commit is contained in:
Ben Mabey 2012-12-06 12:44:19 -08:00
commit 2a32a9c9be

View file

@ -6,7 +6,7 @@ require 'bundler'
Bundler.setup
require 'rspec/expectations'
require 'ruby-debug'
#require 'ruby-debug'
DB_DIR = "#{File.dirname(__FILE__)}/../../db"
@ -20,19 +20,10 @@ if orm && strategy
$:.unshift(File.dirname(__FILE__) + '/../../../lib')
require 'database_cleaner'
require 'database_cleaner/cucumber'
begin
require "#{File.dirname(__FILE__)}/../../lib/#{orm.downcase}_models"
rescue LoadError => e
raise "You don't have the #{orm} ORM installed"
end
require "#{File.dirname(__FILE__)}/../../lib/#{orm.downcase}_models"
if another_orm
begin
require "#{File.dirname(__FILE__)}/../../lib/#{another_orm.downcase}_models"
rescue LoadError => e
raise "You don't have the #{another_orm} ORM installed"
end
require "#{File.dirname(__FILE__)}/../../lib/#{another_orm.downcase}_models"
end