From f6d0c10ffa14d2d194840274c31499f501efdfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 10 Mar 2014 14:35:31 -0300 Subject: [PATCH] Run tests against Rails 4-1-stable Conflicts: .travis.yml --- .travis.yml | 11 +++++++++++ gemfiles/Gemfile.rails-4-1-stable | 15 +++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 gemfiles/Gemfile.rails-4-1-stable diff --git a/.travis.yml b/.travis.yml index 331435e7..7bb94af8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,17 @@ language: ruby rvm: - 1.9.3 - 2.0.0 + - 2.1.1 + - rbx + - jruby-19mode +gemfile: + - gemfiles/Gemfile.rails-head + - gemfiles/Gemfile.rails-4-1-stable + - Gemfile +matrix: + allow_failures: + - gemfile: gemfiles/Gemfile.rails-head + - gemfile: gemfiles/Gemfile.rails-4-1-stable notifications: email: false campfire: diff --git a/gemfiles/Gemfile.rails-4-1-stable b/gemfiles/Gemfile.rails-4-1-stable new file mode 100644 index 00000000..06302097 --- /dev/null +++ b/gemfiles/Gemfile.rails-4-1-stable @@ -0,0 +1,15 @@ +source 'https://rubygems.org' + +gemspec :path => '..' + +platforms :rbx do + gem 'rubysl', '~> 2.0' + gem 'rubinius-developer_tools' +end + +gem 'country_select', '~> 1.1.1' +gem 'railties', github: 'rails/rails', branch: '4-1-stable' +gem 'activemodel', github: 'rails/rails', branch: '4-1-stable' +gem 'actionpack', github: 'rails/rails', branch: '4-1-stable' +gem 'rake' +gem 'tzinfo'