Commit acd43c15 by John Hawthorn Committed by GitHub

Merge pull request #424 from jhawthorn/versions_updates

Version-related cleanup
parents 3092f363 c332f2a4
...@@ -3,7 +3,7 @@ source 'https://rubygems.org' ...@@ -3,7 +3,7 @@ source 'https://rubygems.org'
gem 'sqlite3', platforms: [:ruby] gem 'sqlite3', platforms: [:ruby]
platforms :jruby do platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5' gem 'activerecord-jdbcsqlite3-adapter'
end end
platforms :rbx do platforms :rbx do
...@@ -12,7 +12,7 @@ platforms :rbx do ...@@ -12,7 +12,7 @@ platforms :rbx do
gem 'rubinius-developer_tools' gem 'rubinius-developer_tools'
end end
rails = ENV['RAILS'] || '~> 4.2.0' rails = ENV['RAILS'] || '~> 5.1.0'
gem 'rails', rails gem 'rails', rails
......
...@@ -5,6 +5,10 @@ require 'paranoia' ...@@ -5,6 +5,10 @@ require 'paranoia'
test_framework = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase test_framework = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=)
ActiveRecord::Base.raise_in_transactional_callbacks = true
end
def connect! def connect!
ActiveRecord::Base.establish_connection :adapter => 'sqlite3', database: ':memory:' ActiveRecord::Base.establish_connection :adapter => 'sqlite3', database: ':memory:'
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment