Permalink
Browse files

Update ActiveRecord edge to use Minitest rather than TestUnit, and us…

…e 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
  • Loading branch information...
1 parent b6aa565 commit 9de4639f6aa2cac604c529d0364ce808889a6f9e @petergoldstein petergoldstein committed Dec 26, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 .travis.yml
  2. +2 −2 gemfiles/active_record_edge.gemfile
View
@@ -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
@@ -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 => '../'

0 comments on commit 9de4639

Please sign in to comment.