Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Depend on jdbc master.
  • Loading branch information
josevalim committed Sep 8, 2011
1 parent 601e1d3 commit 9ebcb69
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Expand Up @@ -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
Expand Down
11 changes: 3 additions & 8 deletions test/rails_app/config/boot.rb
Expand Up @@ -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.