From 9ebcb691b0dd8bc7205204aedbe830a0516b85b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 8 Sep 2011 09:05:06 +0200 Subject: [PATCH] Depend on jdbc master. --- Gemfile | 2 ++ test/rails_app/config/boot.rb | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 1f7984c8..dc27defb 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,9 @@ group :test do end platforms :jruby do + gem 'activerecord-jdbc-adapter', :git => 'https://github.com/nicksieger/activerecord-jdbc-adapter.git' gem 'activerecord-jdbcsqlite3-adapter' + gem 'jruby-openssl' end platforms :mri_18 do diff --git a/test/rails_app/config/boot.rb b/test/rails_app/config/boot.rb index ea1f6717..ced57d00 100644 --- a/test/rails_app/config/boot.rb +++ b/test/rails_app/config/boot.rb @@ -2,12 +2,7 @@ unless defined?(DEVISE_ORM) DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym end -begin - require File.expand_path("../../../../.bundle/environment", __FILE__) -rescue LoadError - require 'rubygems' - require 'bundler' - Bundler.setup :default, :test, DEVISE_ORM -end +require 'rubygems' +require 'bundler/setup' -$:.unshift File.expand_path('../../../../lib', __FILE__) +$:.unshift File.expand_path('../../../../lib', __FILE__) \ No newline at end of file