Merge pull request #17 from zendesk/pschambacher/cleanup

pschambacher · web-flow · commit feb606cab473 · 2017-04-28T10:03:02.000-07:00
Cleanup of the gem
diff --git a/.travis.yml b/.travis.yml
@@ -5,19 +5,16 @@ sudo: false
 branches:
   only: master
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 gemfile:
-  - gemfiles/rails_3.2.gemfile
-  - gemfiles/rails_4.1.gemfile
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails3.2.gemfile
+  - gemfiles/rails4.2.gemfile
+  - gemfiles/rails5.0.gemfile
 matrix:
   exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.1.8
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.2.4
-      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails3.2.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails4.2.gemfile
diff --git a/gemfiles/rails3.2.gemfile b/gemfiles/rails3.2.gemfile
diff --git a/gemfiles/rails3.2.gemfile.lock b/gemfiles/rails3.2.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     migration_tools (1.3.1)
       activerecord (>= 3.2.6, < 5.1)
@@ -51,4 +51,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.12.3
+   1.14.6
diff --git a/gemfiles/rails4.2.gemfile b/gemfiles/rails4.2.gemfile
diff --git a/gemfiles/rails4.2.gemfile.lock b/gemfiles/rails4.2.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     migration_tools (1.3.1)
       activerecord (>= 3.2.6, < 5.1)
@@ -55,4 +55,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.12.3
+   1.14.6
diff --git a/gemfiles/rails5.0.gemfile b/gemfiles/rails5.0.gemfile
diff --git a/gemfiles/rails5.0.gemfile.lock b/gemfiles/rails5.0.gemfile.lock
@@ -1,5 +1,5 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     migration_tools (1.3.1)
       activerecord (>= 3.2.6, < 5.1)
@@ -50,4 +50,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.12.5
+   1.14.6
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
diff --git a/gemfiles/rails_4.1.gemfile.lock b/gemfiles/rails_4.1.gemfile.lock
diff --git a/test/helper.rb b/test/helper.rb
@@ -6,6 +6,13 @@
 require 'active_support/all'
 require 'migration_tools'
 
+MIGRATION_CLASS = if ActiveRecord::Migration.respond_to?(:[])
+  rails_version = "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}".to_f
+  ActiveRecord::Migration[rails_version]
+else
+  ActiveRecord::Migration
+end
+
 dir = File.expand_path('../migrations', __FILE__)
 ActiveRecord::Migrator.migrations_paths.replace([dir])
 Dir.glob(File.join(dir, '*.rb')).each {|f| require f}
diff --git a/test/migrations/0_alpha.rb b/test/migrations/0_alpha.rb
@@ -1,4 +1,4 @@
-class Alpha < ActiveRecord::Migration
+class Alpha < MIGRATION_CLASS
   group :before
 
   def self.up
diff --git a/test/migrations/1_beta.rb b/test/migrations/1_beta.rb
@@ -1,4 +1,4 @@
-class Beta < ActiveRecord::Migration
+class Beta < MIGRATION_CLASS
   group :before
 
   def self.up
diff --git a/test/migrations/2_delta.rb b/test/migrations/2_delta.rb
@@ -1,4 +1,4 @@
-class Delta < ActiveRecord::Migration
+class Delta < MIGRATION_CLASS
   group :change
 
   def self.up
diff --git a/test/migrations/3_kappa.rb b/test/migrations/3_kappa.rb
@@ -1,4 +1,4 @@
-class Kappa < ActiveRecord::Migration
+class Kappa < MIGRATION_CLASS
   def self.up
   end
 end
diff --git a/test/test_migration_tools.rb b/test/test_migration_tools.rb
@@ -41,7 +41,7 @@ def migration_proxy(m)
 
   it "runtime_checking" do
     begin
-      eval("class Kappa < ActiveRecord::Migration; group 'drunk'; end")
+      eval("class Kappa < MIGRATION_CLASS; group 'drunk'; end")
       fail "You should not be able to specify custom groups"
     rescue RuntimeError => e
       assert e.message.index('Invalid group "drunk" - valid groups are ["before", "during", "after", "change"]')
