Merge pull request #603 from tachyons/feat_rails_6_test

Add rails 6 to test matrix

.travis.yml

@@ -9,19 +9,23 @@ rvm:
   - 2.3.6
   - 2.4.3
   - 2.5.0
+  - 2.6.2
   - ruby-head
 gemfile:
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
   - gemfiles/rails_master.gemfile
 bundler_args: --without local
 before_install:
   - sudo /etc/init.d/mysql stop
   - sudo /etc/init.d/postgresql stop
   - docker-compose up -d
-  - gem install bundler -v '> 1.5.0'
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem uninstall bundler -v '>= 2' -x || true
+  - gem install bundler -v '< 2'
 env:
   RUBY_GC_MALLOC_LIMIT: 90000000
   RUBY_GC_HEAP_FREE_SLOTS: 200000
@@ -38,12 +42,22 @@ matrix:
       gemfile: gemfiles/rails_5_1.gemfile
     - rvm: 2.1.9
       gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: 2.1.9
+      gemfile: gemfiles/rails_6_0.gemfile
     - rvm: 2.1.9
       gemfile: gemfiles/rails_master.gemfile
+    - rvm: 2.2.9 
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 2.3.6
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 2.4.3
+      gemfile: gemfiles/rails_6_0.gemfile
     - rvm: jruby-9.1.15.0
       gemfile: gemfiles/rails_5_1.gemfile
     - rvm: jruby-9.1.15.0
       gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: jruby-9.1.15.0
+      gemfile: gemfiles/rails_6_0.gemfile
     - rvm: jruby-9.1.15.0
       gemfile: gemfiles/rails_master.gemfile
   fast_finish: true

Appraisals

@@ -38,17 +38,34 @@ end
 appraise "rails-5-2" do
   gem "rails", "~> 5.2.0"
   platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 51.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 51.0'
+    gem 'activerecord-jdbc-adapter', '~> 52.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 52.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 52.0'
+  end
+end
+
+
+appraise "rails-6-0" do
+  gem "rails", "~> 6.0.0.rc1"
+  platforms :ruby do
+    gem 'sqlite3', '~> 1.4'
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbc-adapter', '~> 60.0.rc1'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 60.0.rc1'
+    gem 'activerecord-jdbcmysql-adapter', '~> 60.0.rc1'
   end
 end
 
+
 appraise "rails-master" do
   gem "rails", git: 'https://github.com/rails/rails.git'
+  platforms :ruby do
+    gem 'sqlite3', '~> 1.4'
+  end
   platforms :jruby do
-    gem 'activerecord-jdbc-adapter', '~> 51.0'
-    gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0'
-    gem 'activerecord-jdbcmysql-adapter', '~> 51.0'
+    gem 'activerecord-jdbc-adapter', '~> 52.0'
+    gem 'activerecord-jdbcpostgresql-adapter', '~> 52.0'
+    gem 'activerecord-jdbcmysql-adapter', '~> 52.0'
   end
 end

apartment.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
 
   # must be >= 3.1.2 due to bug in prepared_statements
-  s.add_dependency 'activerecord',    '>= 3.1.2', '< 6.0'
+  s.add_dependency 'activerecord',    '>= 3.1.2', '< 6.1'
   s.add_dependency 'rack',            '>= 1.3.6'
   s.add_dependency 'public_suffix',   '>= 2'
   s.add_dependency 'parallel',        '>= 0.7.1'
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec',        '~> 3.4'
   s.add_development_dependency 'rspec-rails',  '~> 3.4'
   s.add_development_dependency 'capybara',     '~> 2.0'
+  s.add_development_dependency 'bundler',      '>= 1.3', '< 2.0'
 
   if defined?(JRUBY_VERSION)
     s.add_development_dependency 'activerecord-jdbc-adapter'
@@ -40,6 +41,6 @@ Gem::Specification.new do |s|
   else
     s.add_development_dependency 'mysql2'
     s.add_development_dependency 'pg'
-    s.add_development_dependency 'sqlite3'
+    s.add_development_dependency 'sqlite3', '~> 1.3.6'
   end
 end

gemfiles/rails_5_2.gemfile

@@ -10,9 +10,9 @@ group :local do
 end
 
 platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 51.0"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 51.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 51.0"
+  gem "activerecord-jdbc-adapter", "~> 52.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 52.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 52.0"
 end
 
 gemspec path: "../"

gemfiles/rails_6_0.gemfile

@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 6.0.0.rc1"
+
+group :local do
+  gem "pry"
+  gem "guard-rspec", "~> 4.2"
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.4"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 60.0.rc1"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 60.0.rc1"
+  gem "activerecord-jdbcmysql-adapter", "~> 60.0.rc1"
+end
+
+gemspec path: "../"

gemfiles/rails_master.gemfile

@@ -9,10 +9,14 @@ group :local do
   gem "guard-rspec", "~> 4.2"
 end
 
+platforms :ruby do
+  gem "sqlite3", "~> 1.4"
+end
+
 platforms :jruby do
-  gem "activerecord-jdbc-adapter", "~> 51.0"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 51.0"
-  gem "activerecord-jdbcmysql-adapter", "~> 51.0"
+  gem "activerecord-jdbc-adapter", "~> 52.0"
+  gem "activerecord-jdbcpostgresql-adapter", "~> 52.0"
+  gem "activerecord-jdbcmysql-adapter", "~> 52.0"
 end
 
 gemspec path: "../"