Add StateMachines::Machine.ignore_method_conflicts in initializer

spree · Mar 14, 2016 · 7cca4c0 · 7cca4c0
1 parent d9496a6
commit 7cca4c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/app/models/spree/order/checkout.rb b/core/app/models/spree/order/checkout.rb
@@ -38,8 +38,6 @@ def self.define_state_machine!
 
             klass = self
 
-            # To avoid a ton of warnings when the state machine is re-defined
-            StateMachines::Machine.ignore_method_conflicts = true
             # To avoid multiple occurrences of the same transition being defined
             # On first definition, state_machines will not be defined
             state_machines.clear if respond_to?(:state_machines)

diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
@@ -15,6 +15,10 @@
 require 'responders'
 require 'state_machines-activerecord'
 
+# This is required because ActiveModel::Validations#invalid? conflicts with the
+# invalid state of a Payment. In the future this should be removed.
+StateMachines::Machine.ignore_method_conflicts = true
+
 module Spree
 
   mattr_accessor :user_class