Merge pull request #321 from BenMorganIO/rails5-rc1-and-ruby-bump

Rails RC1 and Minor Ruby Bumps for Testing

.travis.yml

 sudo: false
 sudo: false
 language: ruby
 language: ruby
+cache: bundler
 rvm:
 rvm:
   - 2.0.0
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - jruby-9.0.5.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+  - jruby-9.1.0.0
 
 
 env:
 env:
   matrix:
   matrix:
     - RAILS='~> 4.0.13'
     - RAILS='~> 4.0.13'
-    - RAILS='~> 4.1.10'
-    - RAILS='~> 4.2.1'
-    - RAILS='~> 5.0.0.beta1'
+    - RAILS='~> 4.1.15'
+    - RAILS='~> 4.2.6'
+    - RAILS='~> 5.0.0.rc1'
 
 
 matrix:
 matrix:
   exclude:
   exclude:
-    - env: RAILS='~> 5.0.0.beta1'
+    - env: RAILS='~> 5.0.0.rc1'
       rvm: 2.0.0
       rvm: 2.0.0
-    - env: RAILS='~> 5.0.0.beta1'
-      rvm: 2.1.8
+    - env: RAILS='~> 5.0.0.rc1'
+      rvm: 2.1.10
   allow_failures:
   allow_failures:
-    - env: RAILS='~> 5.0.0.beta1'
-      rvm: jruby-9.0.5.0
+    - env: RAILS='~> 5.0.0.rc1'
+      rvm: jruby-9.1.0.0

Gemfile

 source 'https://rubygems.org'
 source 'https://rubygems.org'
 
 
-gem 'sqlite3', :platforms => [:ruby]
-gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+gem 'sqlite3', platforms: [:ruby]
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+end
 
 
 platforms :rbx do
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubysl', '~> 2.0'

test/paranoia_test.rb

@@ -4,7 +4,6 @@ require 'minitest/autorun'
 require 'paranoia'
 require 'paranoia'
 
 
 test_framework = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
 test_framework = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
-ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::VERSION::STRING >= '4.2'
 
 
 def connect!
 def connect!
   ActiveRecord::Base.establish_connection :adapter => 'sqlite3', database: ':memory:'
   ActiveRecord::Base.establish_connection :adapter => 'sqlite3', database: ':memory:'