diff --git a/lib/rest-assured/config.rb b/lib/rest-assured/config.rb index 0756e84..06a7e15 100644 --- a/lib/rest-assured/config.rb +++ b/lib/rest-assured/config.rb @@ -101,7 +101,10 @@ def self.connect_db end def self.migrate_db - migrate = lambda { ActiveRecord::MigrationContext.new(File.expand_path('../../../db/migrate', __FILE__)).migrate } + migrate = lambda do + ActiveRecord::MigrationContext.new(File.expand_path('../../../db/migrate', __FILE__), + ActiveRecord::Base.connection.schema_migration).migrate + end silence_stdout = lambda do |&thing| original_stdout = $stdout $stdout = File.open(File::NULL, "w") diff --git a/rest-assured.gemspec b/rest-assured.gemspec index 96380b2..fb067af 100644 --- a/rest-assured.gemspec +++ b/rest-assured.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.add_dependency 'childprocess', '~> 0.3' s.add_dependency 'sinatra-flash' s.add_dependency 'haml', ['>= 4.0', '~> 5.0'] - s.add_dependency 'activerecord', ['>= 4.0', '~> 5.0'] + s.add_dependency 'activerecord', ['~> 6.0'] s.add_dependency 'activeresource', ['>= 4.0', '~> 5.0'] s.add_dependency 'thin', '~> 1.6' end