Merge pull request #56 from sue445/feature/rails_6.0.0.rc2

Fix CI on activerecord v6.0.0.rc2
sue445 · Jul 26, 2019 · 97664fb · 97664fb
2 parents ff76872 + 22f2da3
commit 97664fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0.rc1"
+gem "rails", "~> 6.0.0.rc2"
 
 # c.f. https://github.com/rails/rails/blob/v6.0.0.rc1/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L13
 gem "sqlite3", "~> 1.4"

diff --git a/spec/db/setup.rb b/spec/db/setup.rb
@@ -22,7 +22,9 @@ def up_migrate
   ActiveRecord::Tasks::DatabaseTasks.create(configuration)
 
   # db:migrate
-  if ActiveRecord.version >= Gem::Version.create("5.2.0")
+  if ActiveRecord.version >= Gem::Version.create("6.0.0.rc2")
+    ActiveRecord::MigrationContext.new(migrate_dir, ActiveRecord::SchemaMigration).up
+  elsif ActiveRecord.version >= Gem::Version.create("5.2.0")
     ActiveRecord::MigrationContext.new(migrate_dir).up
   else
     ActiveRecord::Migrator.up(migrate_dir)
@@ -31,7 +33,9 @@ def up_migrate
 
 def down_migrate
   # db:down
-  if ActiveRecord.version >= Gem::Version.create("5.2.0")
+  if ActiveRecord.version >= Gem::Version.create("6.0.0.rc2")
+    ActiveRecord::MigrationContext.new(migrate_dir, ActiveRecord::SchemaMigration).down
+  elsif ActiveRecord.version >= Gem::Version.create("5.2.0")
     ActiveRecord::MigrationContext.new(migrate_dir).down
   else
     ActiveRecord::Migrator.down(migrate_dir)