Skip to content

Commit ec76356

Browse files
JonRoweSam Phippen
authored andcommitted
setup travis to run rails 5
1 parent 6c75c64 commit ec76356

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ env:
5252
- RAILS_VERSION='~> 3.0.20'
5353

5454
matrix:
55+
include:
56+
# Rails 5.x only supports 2.2
57+
- rvm: 2.2.2
58+
env: RAILS_VERSION=master
5559
exclude:
5660
# 3.0.x is not supported on MRI 2.0+
5761
- rvm: 2.0.0

Gemfile-rails-dependencies

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ when /master/
1010
gem 'coffee-rails', :git => "git://github.com/rails/coffee-rails.git"
1111
gem 'rack', :git => 'git://github.com/rack/rack.git'
1212
gem 'i18n', :git => 'git://github.com/svenfuchs/i18n.git', :branch => 'master'
13+
gem 'sprockets', :git => 'git://github.com/rails/sprockets.git', :branch => 'master'
14+
gem 'sprockets-rails', :git => 'git://github.com/rails/sprockets-rails.git', :branch => 'master'
1315
when /stable$/
1416
gem "rails", :git => "git://github.com/rails/rails.git", :branch => version
1517
when nil, false, ""

rspec-rails.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Gem::Specification.new do |s|
2525
s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
2626
end
2727

28-
s.add_runtime_dependency(%q<activesupport>, [">= 3.0", "< 4.3"])
29-
s.add_runtime_dependency(%q<actionpack>, [">= 3.0", "< 4.3"])
30-
s.add_runtime_dependency(%q<railties>, [">= 3.0", "< 4.3"])
28+
s.add_runtime_dependency %q<activesupport>, ">= 3.0"
29+
s.add_runtime_dependency %q<actionpack>, ">= 3.0"
30+
s.add_runtime_dependency %q<railties>, ">= 3.0"
3131
%w[core expectations mocks support].each do |name|
3232
if RSpec::Rails::Version::STRING =~ /[a-zA-Z]+/ # prerelease builds
3333
s.add_runtime_dependency "rspec-#{name}", "= #{RSpec::Rails::Version::STRING}"

0 commit comments

Comments
 (0)