all aasm tests without activerecord moved over and passing

3 files changed, 26 insertions, 8 deletions

diff --git a/activemodel/lib/active_model/state_machine.rb b/activemodel/lib/active_model/state_machine.rb
index 2a5ac95a3e..96df6539ae 100644
--- a/activemodel/lib/active_model/state_machine.rb
+++ b/activemodel/lib/active_model/state_machine.rb
@@ -37,13 +37,29 @@ module ActiveModel
       end
     end
 
-    def current_state(name = nil, new_state = nil)
+    def current_state(name = nil, new_state = nil, persist = false)
       sm   = self.class.state_machine(name)
-      ivar = "@#{sm.name}_current_state"
+      ivar = sm.current_state_variable
       if name && new_state
+        if persist && respond_to?(:write_state)
+          write_state(sm, new_state)
+        end
+
+        if respond_to?(:write_state_without_persistence)
+          write_state_without_persistence(sm, new_state)
+        end
+
         instance_variable_set(ivar, new_state)
       else
-        instance_variable_get(ivar) || instance_variable_set(ivar, sm.initial_state)
+        instance_variable_set(ivar, nil) unless instance_variable_defined?(ivar)
+        value = instance_variable_get(ivar)
+        return value if value
+
+        if respond_to?(:read_state)
+          value = instance_variable_set(ivar, read_state(sm))
+        end
+
+        value || sm.initial_state
       end
     end
   end
diff --git a/activemodel/lib/active_model/state_machine/event.rb b/activemodel/lib/active_model/state_machine/event.rb
index ea4df343de..e8bc8ebdb7 100644
--- a/activemodel/lib/active_model/state_machine/event.rb
+++ b/activemodel/lib/active_model/state_machine/event.rb
@@ -37,10 +37,6 @@ module ActiveModel
         @transitions.any? { |t| t.from? state }
       end
 
-      def success?
-        !!@success
-      end
-
       def ==(event)
         if event.is_a? Symbol
           name == event
diff --git a/activemodel/lib/active_model/state_machine/machine.rb b/activemodel/lib/active_model/state_machine/machine.rb
index 53ce71794f..170505c0b2 100644
--- a/activemodel/lib/active_model/state_machine/machine.rb
+++ b/activemodel/lib/active_model/state_machine/machine.rb
@@ -28,7 +28,9 @@ module ActiveModel
             record.send(event_fired_callback, record.current_state, new_state)
           end
 
-          record.current_state(@name, new_state)
+          record.current_state(@name, new_state, persist)
+          record.send(@events[event].success) if @events[event].success
+          true
         else
           if record.respond_to?(event_failed_callback)
             record.send(event_failed_callback, event)
@@ -47,6 +49,10 @@ module ActiveModel
         events.map! { |event| event.name }
       end
 
+      def current_state_variable
+        "@#{@name}_current_state"
+      end
+
     private
       def state(name, options = {})
         @states << (state_index[name] ||= State.new(name, :machine => self)).update(options)