New version of webmock to fix error with ruby 2.6

This commit is contained in:
Kyle Drake 2019-01-19 01:39:42 -08:00
parent e81d3fed40
commit 590d2bdd49
2 changed files with 22 additions and 9 deletions

18
Gemfile
View file

@ -64,20 +64,20 @@ end
group :test do
gem 'faker'
gem 'fabrication', require: 'fabrication'
gem 'fabrication', require: 'fabrication'
gem 'minitest'
gem 'minitest-reporters', require: 'minitest/reporters'
gem 'rack-test', require: 'rack/test'
gem 'mocha', require: nil
gem 'rake', require: nil
gem 'minitest-reporters', require: 'minitest/reporters'
gem 'rack-test', require: 'rack/test'
gem 'mocha', require: nil
gem 'rake', require: nil
gem 'poltergeist'
gem 'capybara_minitest_spec'
gem 'capybara', require: nil #, '2.10.1', require: nil
gem 'rack_session_access', require: nil
gem 'webmock', require: nil
gem 'capybara', require: nil #, '2.10.1', require: nil
gem 'rack_session_access', require: nil
gem 'webmock', '3.5.1', require: nil
gem 'stripe-ruby-mock', '2.5.6', require: 'stripe_mock'
gem 'timecop'
gem 'mock_redis'
gem 'simplecov', require: nil
gem 'simplecov', require: nil
gem 'm'
end

View file

@ -0,0 +1,13 @@
Sequel.migration do
up {
DB.drop_column :sites, :archiving_disabled
DB.drop_column :sites, :archiving_private
DB.add_column :sites, :ipfs_archiving_enabled, :boolean, default: false
}
down {
DB.drop_column :sites, :ipfs_archiving_enabled
DB.add_column :sites, :archiving_disabled, :boolean, default: false
DB.add_column :sites, :archiving_private, :boolean, default: false
}
end