From f8e2fe4320bdc1f2c06dc77391239937b7fc9e68 Mon Sep 17 00:00:00 2001 From: Johnny Shields Date: Thu, 15 Sep 2016 05:06:05 +0900 Subject: Fix failing tests on 3-2-stable branch: - Set sudo: false in .travis.yml which uses latest travis engine and fixes some failing specs - Use older version of gems in Gemfile if RUBY_VERSION < '1.9.3' (no change to .gemspec) - Fix two cases of hash rockets in tests (required for Ruby 1.8.7) - Skip failing test "test_ensure_that_migration_tasks_work_with_mountable_option" which breaks due to Bundler no longer accepting the default generated .gemspec format. - Skip railties specs on Ruby 1.8.7 (mark as an allowed failure.) --- Gemfile | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e82b66b255..a81790172a 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,12 @@ else end gem 'bcrypt-ruby', '~> 3.0.0' -gem 'jquery-rails' + +if RUBY_VERSION < '1.9.3' + gem 'jquery-rails', '< 4' +else + gem 'jquery-rails' +end if ENV['JOURNEY'] gem 'journey', :path => ENV['JOURNEY'] @@ -17,7 +22,12 @@ else gem 'journey' end -gem 'i18n', '~> 0.6.11' +if RUBY_VERSION < '1.9.3' + gem 'i18n', '~> 0.6.11', '< 0.7' +else + gem 'i18n', '~> 0.6.11' +end + gem 'test-unit', '~> 3.0.0' if RUBY_VERSION < '1.9.3' @@ -26,12 +36,21 @@ end # This needs to be with require false to avoid # it being automatically loaded by sprockets -gem 'uglifier', '>= 1.0.3', :require => false +if RUBY_VERSION < '1.9.3' + gem 'uglifier', '>= 1.0.3', '< 3', :require => false +else + gem 'uglifier', '>= 1.0.3', :require => false +end # execjs >= 2.1.0 doesn't work with Ruby 1.8 gem 'execjs', '< 2.1.0' -gem 'rake', '>= 0.8.7' +if RUBY_VERSION < '1.9.3' + gem 'rake', '>= 0.8.7', '< 11' +else + gem 'rake', '>= 0.8.7' +end + gem 'mocha', '~> 0.14', :require => false group :doc do -- cgit v1.2.3