Skip to content

Commit

Permalink
Merge pull request #17 from kjg/travis_updates
Browse files Browse the repository at this point in the history
Test more combinations in travis
  • Loading branch information
Ismael Celis committed Feb 14, 2014
2 parents 42c51a7 + a602f8e commit e3162b8
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.config
.yardoc
Gemfile.lock
gemfiles/Gemfile*.lock
InstalledFiles
_yardoc
coverage
Expand Down
22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
language: ruby
rvm:
- 2.0.0
- 1.9.3
- 1.9.2
- 1.8.7

gemfile:
- gemfiles/Gemfile.as-2.3.x
- gemfiles/Gemfile.as-3.0.x
- gemfiles/Gemfile.as-3.1.x
- gemfiles/Gemfile.as-3.2.x
- gemfiles/Gemfile.as-4.0.x

matrix:
include:
- gemfile: gemfiles/Gemfile.as-1.4.4
rvm: 1.8.7
exclude:
- gemfile: gemfiles/Gemfile.as-2.3.x
rvm: 2.0.0
- gemfile: gemfiles/Gemfile.as-4.0.x
rvm: 1.8.7
- gemfile: gemfiles/Gemfile.as-4.0.x
rvm: 1.9.2
5 changes: 5 additions & 0 deletions gemfiles/Gemfile.as-1.4.4
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source 'https://rubygems.org'

# Specify your gem's dependencies in oat.gemspec
gem 'activesupport', '1.4.4'
gemspec :path => "../"
5 changes: 5 additions & 0 deletions gemfiles/Gemfile.as-2.3.x
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source 'https://rubygems.org'

# Specify your gem's dependencies in oat.gemspec
gem 'activesupport', '~>2.3.18'
gemspec :path => "../"
6 changes: 6 additions & 0 deletions gemfiles/Gemfile.as-3.0.x
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'

# Specify your gem's dependencies in oat.gemspec
gem 'activesupport', '~>3.0.20'
gem 'i18n'
gemspec :path => "../"
6 changes: 6 additions & 0 deletions gemfiles/Gemfile.as-3.1.x
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'

# Specify your gem's dependencies in oat.gemspec
gem 'activesupport', '~>3.1.12'
gem 'i18n'
gemspec :path => "../"
5 changes: 5 additions & 0 deletions gemfiles/Gemfile.as-3.2.x
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source 'https://rubygems.org'

# Specify your gem's dependencies in oat.gemspec
gem 'activesupport', '~>3.2.16'
gemspec :path => "../"
5 changes: 5 additions & 0 deletions gemfiles/Gemfile.as-4.0.x
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source 'https://rubygems.org'

# Specify your gem's dependencies in oat.gemspec
gem 'activesupport', '~>4.0.2'
gemspec :path => "../"
4 changes: 2 additions & 2 deletions spec/adapters/json_api_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
:id => user.id,
:name => user.name,
:age => user.age,
:controller_name => 'some_controller',
:controller_name => 'some_controller'
)

expect(users.first.fetch(:links)).to include(
Expand Down Expand Up @@ -82,7 +82,7 @@
:id => user.id,
:name => user.name,
:age => user.age,
:controller_name => 'some_controller',
:controller_name => 'some_controller'
)
expect(users.first.fetch(:links)).not_to include(:manager)
expect(users.first.fetch(:links)).to include(
Expand Down

0 comments on commit e3162b8

Please sign in to comment.