Skip to content

Commit

Permalink
Enable tests with Ruby 2.2
Browse files Browse the repository at this point in the history
Adds rubysl-test-unit for Rails 4. See issue:
rspec/rspec-rails#858

rubysl-test-unit avoids failures:
https://travis-ci.org/doorkeeper-gem/doorkeeper/builds/50356279

Allows failures for Rails 3.2 on Ruby 2.2, as it's not supported.
  • Loading branch information
tute committed Feb 20, 2015
1 parent d6bca5f commit 56285f2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -5,6 +5,7 @@ cache: bundler
rvm:
- 2.0
- 2.1
- 2.2

env:
- rails=3.2.0
Expand All @@ -23,6 +24,9 @@ services:

matrix:
exclude:
- env: rails=3.2.0
rvm: 2.2

- gemfile: gemfiles/Gemfile.mongoid2.rb
env: rails=4.1.0
- gemfile: gemfiles/Gemfile.mongoid2.rb
Expand Down
3 changes: 3 additions & 0 deletions Gemfile
Expand Up @@ -7,5 +7,8 @@ gem 'rails', "~> #{ENV['rails']}"
if ENV['rails'][0] == '4'
gem 'database_cleaner'
end
if ENV['rails'] =~ /4.0|3.2/
gem 'rubysl-test-unit'
end

gemspec
3 changes: 3 additions & 0 deletions gemfiles/Gemfile.common.rb
Expand Up @@ -7,5 +7,8 @@
if ENV['rails'][0] == '4'
gem 'database_cleaner', '~> 1.3.0'
end
if ENV['rails'] =~ /4.0|3.2/
gem 'rubysl-test-unit'
end

gemspec path: '../'

0 comments on commit 56285f2

Please sign in to comment.