Update ActiveRecord edge to use Minitest rather than TestUnit, and use a more recent version of RSpec without the TestUnit dependencies. Update Travis config to exclude JRuby / ActiveRecord edge until ActiveRecord JDBC driver issue is resolved

This commit is contained in:
Peter M. Goldstein 2013-12-26 15:53:26 -08:00
parent b6aa5650c2
commit 9de4639f6a
2 changed files with 3 additions and 3 deletions

View File

@ -35,5 +35,5 @@ matrix:
- rvm: 1.8.7
gemfile: gemfiles/mongoid_31.gemfile
allow_failures:
- rvm: rbx
- rvm: jruby
gemfile: gemfiles/active_record_edge.gemfile

View File

@ -17,10 +17,10 @@ end
platforms :rbx do
gem 'rubysl', '~> 2.0'
gem 'racc'
gem 'rubysl-test-unit'
gem 'minitest'
gem 'rubinius-developer_tools'
end
gem 'rspec-rails', '>= 2.0'
gem 'rspec-rails', '2.99.0.beta1'
gemspec :path => '../'