Merge pull request #360 from greysteil/rails-6

Add support for Rails 6 (and test it)

.circleci/config.yml

@@ -119,7 +119,7 @@ jobs:
     docker:
       - image: circleci/ruby:2.6.2-node
         environment:
-          - RAILS_VERSION=6.0.0.rc1
+          - RAILS_VERSION=6.0.0
           - DATABASE_URL=mysql2://[email protected]/statesman_test
           - EXCLUDE_MONGOID=true
           - DATABASE_DEPENDENCY_PORT=3306
@@ -134,7 +134,7 @@ jobs:
     docker:
       - image: circleci/ruby:2.6.2-node
         environment:
-          - RAILS_VERSION=6.0.0.rc1
+          - RAILS_VERSION=6.0.0
           - DATABASE_URL=postgres://postgres@localhost/statesman_test
           - EXCLUDE_MONGOID=true
           - DATABASE_DEPENDENCY_PORT=5432

.rubocop_todo.yml

@@ -1,20 +1,28 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-06-07 12:21:30 +0100 using RuboCop version 0.56.0.
+# on 2019-08-17 15:19:58 +0100 using RuboCop version 0.61.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
+# Offense count: 5
 Metrics/AbcSize:
   Max: 18
 
 # Offense count: 4
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 14
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: SkipBlocks, EnforcedStyle.
+# SupportedStyles: described_class, explicit
+RSpec/DescribedClass:
+  Exclude:
+    - 'spec/statesman/adapters/active_record_queries_spec.rb'
+
 # Offense count: 7
 # Configuration parameters: Max.
 RSpec/ExampleLength:
@@ -29,6 +37,12 @@ RSpec/ExpectInHook:
     - 'spec/statesman/adapters/active_record_spec.rb'
     - 'spec/statesman/machine_spec.rb'
 
+# Offense count: 3
+RSpec/ImplicitBlockExpectation:
+  Exclude:
+    - 'spec/statesman/adapters/active_record_spec.rb'
+    - 'spec/statesman/adapters/shared_examples.rb'
+
 # Offense count: 1
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
@@ -40,6 +54,11 @@ RSpec/IteratedExpectation:
   Exclude:
     - 'spec/statesman/machine_spec.rb'
 
+# Offense count: 1
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/statesman/adapters/active_record_queries_spec.rb'
+
 # Offense count: 3
 RSpec/LetSetup:
   Exclude:
@@ -71,7 +90,7 @@ RSpec/ScatteredSetup:
     - 'spec/statesman/machine_spec.rb'
 
 # Offense count: 8
-# Configuration parameters: IgnoreSymbolicNames.
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/generators/statesman/active_record_transition_generator_spec.rb'

lib/statesman/adapters/active_record.rb

@@ -200,6 +200,10 @@ def initialize
         @connection = ::ActiveRecord::Base.connection
       end
 
+      def self.trigger_transactional_callbacks?
+        true
+      end
+
       def trigger_transactional_callbacks?
         true
       end