Skip to content
Browse files

Depend on jdbc master.

  • Loading branch information...
1 parent 601e1d3 commit 9ebcb691b0dd8bc7205204aedbe830a0516b85b2 @josevalim josevalim committed Sep 8, 2011
Showing with 5 additions and 8 deletions.
  1. +2 −0 Gemfile
  2. +3 −8 test/rails_app/config/boot.rb
View
2 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
View
11 test/rails_app/config/boot.rb
@@ -2,12 +2,7 @@
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__)

0 comments on commit 9ebcb69

Please sign in to comment.
Something went wrong with that request. Please try again.