Skip to content

Commit b0744da

Browse files
committed
Add test infrastructure for Rails 4
1 parent aa057b5 commit b0744da

File tree

2 files changed

+41
-12
lines changed

2 files changed

+41
-12
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ services:
44
rvm:
55
- 1.9.3
66
- 2.0.0
7+
env:
8+
- RAILS_VERSION=3
9+
- RAILS_VERSION=4

Gemfile

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,49 @@ gemspec
77

88

99
# Test app stuff
10+
case ENV['RAILS_VERSION']
11+
when '4'
12+
gem 'rails', '~> 4.0.0'
1013

11-
gem 'rails', '~> 3.2.6'
14+
# Waiting for the release
15+
gem 'activeadmin', github: 'gregbell/active_admin', branch: 'rails4'
16+
gem 'mongoid', github: 'mongoid/mongoid'
1217

13-
# Gems used only for assets and not required
14-
# in production environments by default.
15-
group :assets do
16-
gem 'sass-rails', '~> 3.2.3'
17-
gem 'coffee-rails', '~> 3.2.1'
18+
gem 'sass-rails', '~> 4.0.0'
19+
gem 'uglifier', '>= 1.3.0'
20+
gem 'coffee-rails', '~> 4.0.0'
1821

19-
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
20-
# gem 'therubyracer', :platforms => :ruby
21-
gem 'uglifier', '>= 1.0.3'
22+
# Bundler hacks
23+
gem 'railties', '~> 4.0.0' # forced to overcome coffee-rails
24+
25+
gem 'jquery-rails'
26+
gem 'turbolinks'
27+
gem 'jbuilder', '~> 1.2'
28+
29+
group :doc do
30+
gem 'sdoc', require: false
31+
end
32+
33+
34+
else
35+
gem 'rails', '~> 3.2.6'
36+
37+
# Gems used only for assets and not required
38+
# in production environments by default.
39+
group :assets do
40+
gem 'sass-rails', '~> 3.2.3'
41+
gem 'coffee-rails', '~> 3.2.1'
42+
43+
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
44+
# gem 'therubyracer', :platforms => :ruby
45+
gem 'uglifier', '>= 1.0.3'
46+
end
47+
48+
gem 'jquery-rails'
49+
gem 'jquery-ui-rails'
50+
gem 'jslint'
2251
end
2352

24-
gem 'jquery-rails'
25-
gem 'jquery-ui-rails'
26-
gem 'jslint'
2753

2854
group :test do
2955
gem 'capybara'

0 commit comments

Comments
 (0)