test/rails_app/config/boot.rb in simple-layout-0.1.2 vs test/rails_app/config/boot.rb in simple-layout-0.2.0
- old
+ new
@@ -1,6 +1,13 @@
-require 'rubygems'
+unless defined?(DEVISE_ORM)
+ DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
+end
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+begin
+ require File.expand_path("../../../../.bundle/environment", __FILE__)
+rescue LoadError
+ require 'rubygems'
+ require 'bundler'
+ Bundler.setup :default, DEVISE_ORM
+end
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+$:.unshift File.expand_path('../../../../lib', __FILE__)
\ No newline at end of file