Add rails 5.1 to CI

Shopify · May 1, 2017 · d0bf7c3 · d0bf7c3
1 parent 41837fd
commit d0bf7c3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,14 @@ rvm:
 gemfile:
   - Gemfile.rails42
   - Gemfile.rails50
+  - Gemfile.rails51
 
 matrix:
   exclude:
     - gemfile: Gemfile.rails50
       env: DB=postgresql
+    - gemfile: Gemfile.rails51
+      env: DB=postgresql
 
 env:
   - DB=mysql2

diff --git a/Gemfile.rails51 b/Gemfile.rails51
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activerecord', '~> 5.1.0'
+gem 'activesupport', '~> 5.1.0'
+gem 'mysql2', '>= 0.3.18', '< 0.5'
diff --git a/test/schema_change_test.rb b/test/schema_change_test.rb
@@ -1,13 +1,15 @@
 require "test_helper"
 
 class SchemaChangeTest < IdentityCache::TestCase
-  class AddColumnToChild < ActiveRecord::Migration
+  Migration = ActiveRecord::Migration.try(:[], 4.2) || ActiveRecord::Migration
+
+  class AddColumnToChild < Migration
     def up
       add_column :associated_records, :shiny, :string
     end
   end
 
-  class AddColumnToDeepChild < ActiveRecord::Migration
+  class AddColumnToDeepChild < Migration
     def up
       add_column :deeply_associated_records, :new_column, :string
     end