diff --git a/.gitignore b/.gitignore index 6eac51464..b77780cdf 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ pkg/* .bundle .rbenv-version Gemfile.lock +gemfiles/*.lock vendor/* .idea .rvmrc diff --git a/.travis.yml b/.travis.yml index d95b26fb3..6ce3c4945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_script: gemfile: - Gemfile - - gemfiles/3.0.gemfile + - gemfiles/ar3.gemfile matrix: fast_finish: true diff --git a/gemfiles/3.0.gemfile b/gemfiles/ar3.gemfile similarity index 89% rename from gemfiles/3.0.gemfile rename to gemfiles/ar3.gemfile index 016503918..d240f4f65 100644 --- a/gemfiles/3.0.gemfile +++ b/gemfiles/ar3.gemfile @@ -1,9 +1,11 @@ source 'https://rubygems.org' -gem 'activerecord', '~> 3.2' -gem 'i18n', '~> 0.6.11' +gem 'activerecord', '3.2.22.2' gem 'request_store', '~> 1.1.0' +# i18n 0.7 requires ruby >= 1.9.3, but we still support 1.8.7 +gem 'i18n', '< 0.7' + # actionpack 3 depends on rack-cache ~> 1.2, but bundler seems to ignore that. # Also rack-cache 1.3 dropped support for ruby 1.8.7. The simplest thing for now # was to specify rack-cache ~> 1.2 here, though it should be unnecessary given @@ -15,15 +17,11 @@ group :development, :test do gem 'shoulda', '~> 3.5' gem 'ffaker', '<= 1.31.0' - # Testing of Rails - gem 'railties', '~> 3.0' - # Testing of Sinatra - gem 'sinatra', '~> 1.0' - gem 'rack-test', '>= 0.6' + gem 'sinatra', '~> 1.1.4' # RSpec testing - gem 'rspec-rails', '~> 3.1.0' + gem 'rspec-rails', '~> 3.4.2' gem 'generator_spec' # To do proper transactional testing with ActiveSupport::TestCase on MySQL