state_machine 0.9.4 → 0.10.0

data/test/unit/state_collection_test.rb

@@ -28,6 +28,7 @@ class StateCollectionTest < Test::Unit::TestCase
     @states << @nil = StateMachine::State.new(@machine, nil)
     @states << @parked = StateMachine::State.new(@machine, :parked)
     @states << @idling = StateMachine::State.new(@machine, :idling)
+    @machine.states.concat(@states)
     
     @object = @klass.new
   end
@@ -40,6 +41,10 @@ class StateCollectionTest < Test::Unit::TestCase
     assert_equal @parked, @states[:parked]
   end
   
+  def test_should_index_by_qualified_name
+    assert_equal @parked, @states[:parked, :qualified_name]
+  end
+  
   def test_should_index_by_value
     assert_equal @parked, @states['parked', :value]
   end
@@ -79,6 +84,25 @@ class StateCollectionTest < Test::Unit::TestCase
   end
 end
 
+class StateCollectionWithNamespaceTest < Test::Unit::TestCase
+  def setup
+    @klass = Class.new
+    @machine = StateMachine::Machine.new(@klass, :namespace => 'vehicle')
+    @states = StateMachine::StateCollection.new(@machine)
+    
+    @states << @state = StateMachine::State.new(@machine, :parked)
+    @machine.states.concat(@states)
+  end
+  
+  def test_should_index_by_name
+    assert_equal @state, @states[:parked, :name]
+  end
+  
+  def test_should_index_by_qualified_name
+    assert_equal @state, @states[:vehicle_parked, :qualified_name]
+  end
+end
+
 class StateCollectionWithCustomStateValuesTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
@@ -86,6 +110,7 @@ class StateCollectionWithCustomStateValuesTest < Test::Unit::TestCase
     @states = StateMachine::StateCollection.new(@machine)
     
     @states << @state = StateMachine::State.new(@machine, :parked, :value => 1)
+    @machine.states.concat(@states)
     
     @object = @klass.new
     @object.state = 1
@@ -112,6 +137,7 @@ class StateCollectionWithStateMatchersTest < Test::Unit::TestCase
     @states = StateMachine::StateCollection.new(@machine)
     
     @states << @state = StateMachine::State.new(@machine, :parked, :if => lambda {|value| !value.nil?})
+    @machine.states.concat(@states)
     
     @object = @klass.new
     @object.state = 1
@@ -138,6 +164,7 @@ class StateCollectionWithInitialStateTest < Test::Unit::TestCase
     
     @states << @parked = StateMachine::State.new(@machine, :parked)
     @states << @idling = StateMachine::State.new(@machine, :idling)
+    @machine.states.concat(@states)
     
     @parked.initial = true
   end
@@ -175,6 +202,7 @@ class StateCollectionWithStateBehaviorsTest < Test::Unit::TestCase
     
     @states << @parked = StateMachine::State.new(@machine, :parked)
     @states << @idling = StateMachine::State.new(@machine, :idling)
+    @machine.states.concat(@states)
     
     @idling.context do
       def speed
@@ -212,6 +240,7 @@ class StateCollectionWithEventTransitionsTest < Test::Unit::TestCase
     
     @states << @parked = StateMachine::State.new(@machine, :parked)
     @states << @idling = StateMachine::State.new(@machine, :idling)
+    @machine.states.concat(@states)
     
     @machine.event :ignite do
       transition :to => :idling
@@ -249,6 +278,7 @@ class StateCollectionWithTransitionCallbacksTest < Test::Unit::TestCase
     
     @states << @parked = StateMachine::State.new(@machine, :parked)
     @states << @idling = StateMachine::State.new(@machine, :idling)
+    @machine.states.concat(@states)
     
     @machine.before_transition :to => :idling, :do => lambda {}
   end

data/test/unit/state_test.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 class StateByDefaultTest < Test::Unit::TestCase
   def setup
     @machine = StateMachine::Machine.new(Class.new)
-    @state = StateMachine::State.new(@machine, :parked)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked)
   end
   
   def test_should_have_a_machine
@@ -43,7 +43,7 @@ end
 class StateTest < Test::Unit::TestCase
   def setup
     @machine = StateMachine::Machine.new(Class.new)
-    @state = StateMachine::State.new(@machine, :parked)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked)
   end
   
   def test_should_raise_exception_if_invalid_option_specified
@@ -87,7 +87,7 @@ class StateWithoutNameTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, nil)
+    @machine.states << @state = StateMachine::State.new(@machine, nil)
   end
   
   def test_should_have_a_nil_name
@@ -121,7 +121,7 @@ class StateWithNameTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :parked)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked)
   end
   
   def test_should_have_a_name
@@ -158,7 +158,7 @@ class StateWithNilValueTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :parked, :value => nil)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :value => nil)
   end
   
   def test_should_have_a_name
@@ -187,7 +187,7 @@ class StateWithSymbolicValueTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :parked, :value => :parked)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :value => :parked)
   end
   
   def test_should_use_custom_value
@@ -213,7 +213,7 @@ class StateWithIntegerValueTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :parked, :value => 1)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :value => 1)
   end
   
   def test_should_use_custom_value
@@ -241,7 +241,7 @@ class StateWithLambdaValueTest < Test::Unit::TestCase
     @args = nil
     @machine = StateMachine::Machine.new(@klass)
     @value = lambda {|*args| @args = args; :parked}
-    @state = StateMachine::State.new(@machine, :parked, :value => @value)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :value => @value)
   end
   
   def test_should_use_evaluated_value_by_default
@@ -328,7 +328,7 @@ class StateWithMatcherTest < Test::Unit::TestCase
     @klass = Class.new
     @args = nil
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :parked, :if => lambda {|value| value == 1})
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :if => lambda {|value| value == 1})
   end
   
   def test_should_not_match_actual_value
@@ -344,7 +344,7 @@ class StateWithHumanNameTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :parked, :human_name => 'stopped')
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :human_name => 'stopped')
   end
   
   def test_should_use_custom_human_name
@@ -356,7 +356,7 @@ class StateWithDynamicHumanNameTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :parked, :human_name => lambda {|state, object| ['stopped', object]})
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :human_name => lambda {|state, object| ['stopped', object]})
   end
   
   def test_should_use_custom_human_name
@@ -379,7 +379,7 @@ end
 class StateInitialTest < Test::Unit::TestCase
   def setup
     @machine = StateMachine::Machine.new(Class.new)
-    @state = StateMachine::State.new(@machine, :parked, :initial => true)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :initial => true)
   end
   
   def test_should_be_initial
@@ -391,7 +391,7 @@ end
 class StateNotInitialTest < Test::Unit::TestCase
   def setup
     @machine = StateMachine::Machine.new(Class.new)
-    @state = StateMachine::State.new(@machine, :parked, :initial => false)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked, :initial => false)
   end
   
   def test_should_not_be_initial
@@ -403,7 +403,7 @@ end
 class StateFinalTest < Test::Unit::TestCase
   def setup
     @machine = StateMachine::Machine.new(Class.new)
-    @state = StateMachine::State.new(@machine, :parked)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked)
   end
   
   def test_should_be_final_without_input_transitions
@@ -430,7 +430,7 @@ end
 class StateNotFinalTest < Test::Unit::TestCase
   def setup
     @machine = StateMachine::Machine.new(Class.new)
-    @state = StateMachine::State.new(@machine, :parked)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked)
   end
   
   def test_should_not_be_final_with_outgoing_whitelist_transitions
@@ -460,6 +460,9 @@ end
 
 class StateWithConflictingHelpersTest < Test::Unit::TestCase
   def setup
+    require 'stringio'
+    @original_stderr, $stderr = $stderr, StringIO.new
+    
     @klass = Class.new do
       def parked?
         0
@@ -470,18 +473,62 @@ class StateWithConflictingHelpersTest < Test::Unit::TestCase
     @object = @klass.new
   end
   
-  def test_should_not_redefine_state_predicate
+  def test_should_not_override_state_predicate
     assert_equal 0, @object.parked?
   end
   
-  def test_should_allow_super_chaining
+  def test_should_not_allow_super_chaining
     @klass.class_eval do
       def parked?
         super ? 1 : 0
       end
     end
     
-    assert_equal 0, @object.parked?
+    assert_raise(NoMethodError) { @object.parked? }
+  end
+  
+  def test_should_output_warning
+    assert_equal "#parked? is already defined, use #state?(:parked) instead.\n", $stderr.string
+  end
+  
+  def teardown
+    $stderr = @original_stderr
+  end
+end
+
+class EventWithConflictingMachineTest < Test::Unit::TestCase
+  def setup
+    require 'stringio'
+    @original_stderr, $stderr = $stderr, StringIO.new
+    
+    @klass = Class.new
+    @state_machine = StateMachine::Machine.new(@klass, :state)
+    @state_machine.states << @state = StateMachine::State.new(@state_machine, :parked)
+  end
+  
+  def test_should_output_warning_if_using_different_attribute
+    @status_machine = StateMachine::Machine.new(@klass, :status)
+    @status_machine.states << @state = StateMachine::State.new(@status_machine, :parked)
+    
+    assert_equal "State :parked for :status is already defined in :state\n", $stderr.string
+  end
+  
+  def test_should_not_output_warning_if_using_same_attribute
+    @status_machine = StateMachine::Machine.new(@klass, :status, :attribute => :state)
+    @status_machine.states << @state = StateMachine::State.new(@status_machine, :parked)
+    
+    assert_equal '', $stderr.string
+  end
+  
+  def test_should_not_output_warning_if_using_different_namespace
+    @status_machine = StateMachine::Machine.new(@klass, :status, :namespace => 'alarm')
+    @status_machine.states << @state = StateMachine::State.new(@status_machine, :parked)
+    
+    assert_equal '', $stderr.string
+  end
+  
+  def teardown
+    $stderr = @original_stderr
   end
 end
 
@@ -489,7 +536,7 @@ class StateWithNamespaceTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass, :namespace => 'alarm')
-    @state = StateMachine::State.new(@machine, :active)
+    @machine.states << @state = StateMachine::State.new(@machine, :active)
     @object = @klass.new
   end
   
@@ -509,7 +556,7 @@ end
 class StateAfterBeingCopiedTest < Test::Unit::TestCase
   def setup
     @machine = StateMachine::Machine.new(Class.new)
-    @state = StateMachine::State.new(@machine, :parked)
+    @machine.states << @state = StateMachine::State.new(@machine, :parked)
     @copied_state = @state.dup
   end
   
@@ -523,7 +570,7 @@ class StateWithContextTest < Test::Unit::TestCase
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
     @ancestors = @klass.ancestors
-    @state = StateMachine::State.new(@machine, :idling)
+    @machine.states << @state = StateMachine::State.new(@machine, :idling)
     
     speed_method = nil
     rpm_method = nil
@@ -568,7 +615,7 @@ class StateWithMultipleContextsTest < Test::Unit::TestCase
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
     @ancestors = @klass.ancestors
-    @state = StateMachine::State.new(@machine, :idling)
+    @machine.states << @state = StateMachine::State.new(@machine, :idling)
     
     speed_method = nil
     @state.context do
@@ -621,7 +668,7 @@ class StateWithExistingContextMethodTest < Test::Unit::TestCase
     @original_speed_method = @klass.instance_method(:speed)
     
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, :idling)
+    @machine.states << @state = StateMachine::State.new(@machine, :idling)
     @state.context do
       def speed
         0
@@ -638,7 +685,7 @@ class StateWithRedefinedContextMethodTest < Test::Unit::TestCase
   def setup
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
-    @state = StateMachine::State.new(@machine, 'on')
+    @machine.states << @state = StateMachine::State.new(@machine, 'on')
     
     old_speed_method = nil
     @state.context do
@@ -669,7 +716,7 @@ class StateWithInvalidMethodCallTest < Test::Unit::TestCase
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
     @ancestors = @klass.ancestors
-    @state = StateMachine::State.new(@machine, :idling)
+    @machine.states << @state = StateMachine::State.new(@machine, :idling)
     @state.context do
       def speed
         0
@@ -689,7 +736,7 @@ class StateWithValidMethodCallTest < Test::Unit::TestCase
     @klass = Class.new
     @machine = StateMachine::Machine.new(@klass)
     @ancestors = @klass.ancestors
-    @state = StateMachine::State.new(@machine, :idling)
+    @machine.states << @state = StateMachine::State.new(@machine, :idling)
     @state.context do
       def speed(arg = nil)
         block_given? ? [arg, yield] : arg
@@ -725,10 +772,10 @@ begin
   class StateDrawingTest < Test::Unit::TestCase
     def setup
       @machine = StateMachine::Machine.new(Class.new)
+      @machine.states << @state = StateMachine::State.new(@machine, :parked, :value => 1)
       @machine.event :ignite do
         transition :parked => :idling
       end
-      @state = StateMachine::State.new(@machine, :parked, :value => 1)
       
       graph = GraphViz.new('G')
       @node = @state.draw(graph)
@@ -747,7 +794,7 @@ begin
     end
     
     def test_should_use_stringified_name_as_name
-      assert_equal 'parked', @node.name
+      assert_equal 'parked', Gem::Version.new(Constants::RGV_VERSION) <= Gem::Version.new('0.9.11') ? @node.name : @node.id
     end
     
     def test_should_use_description_as_label
@@ -758,10 +805,10 @@ begin
   class StateDrawingInitialTest < Test::Unit::TestCase
     def setup
       @machine = StateMachine::Machine.new(Class.new)
+      @machine.states << @state = StateMachine::State.new(@machine, :parked, :initial => true)
       @machine.event :ignite do
         transition :parked => :idling
       end
-      @state = StateMachine::State.new(@machine, :parked, :initial => true)
       
       @graph = GraphViz.new('G')
       @node = @state.draw(@graph)
@@ -780,14 +827,14 @@ begin
   class StateDrawingNilNameTest < Test::Unit::TestCase
     def setup
       @machine = StateMachine::Machine.new(Class.new)
-      @state = StateMachine::State.new(@machine, nil)
+      @machine.states << @state = StateMachine::State.new(@machine, nil)
       
       graph = GraphViz.new('G')
       @node = @state.draw(graph)
     end
     
     def test_should_use_stringified_nil_as_name
-      assert_equal 'nil', @node.name
+      assert_equal 'nil', Gem::Version.new(Constants::RGV_VERSION) <= Gem::Version.new('0.9.11') ? @node.name : @node.id
     end
     
     def test_should_use_description_as_label
@@ -798,14 +845,14 @@ begin
   class StateDrawingLambdaValueTest < Test::Unit::TestCase
     def setup
       @machine = StateMachine::Machine.new(Class.new)
-      @state = StateMachine::State.new(@machine, :parked, :value => lambda {})
+      @machine.states << @state = StateMachine::State.new(@machine, :parked, :value => lambda {})
       
       graph = GraphViz.new('G')
       @node = @state.draw(graph)
     end
     
     def test_should_use_stringified_name_as_name
-      assert_equal 'parked', @node.name
+      assert_equal 'parked', Gem::Version.new(Constants::RGV_VERSION) <= Gem::Version.new('0.9.11') ? @node.name : @node.id
     end
     
     def test_should_use_description_as_label
@@ -816,10 +863,10 @@ begin
   class StateDrawingNonFinalTest < Test::Unit::TestCase
     def setup
       @machine = StateMachine::Machine.new(Class.new)
+      @machine.states << @state = StateMachine::State.new(@machine, :parked)
       @machine.event :ignite do
         transition :parked => :idling
       end
-      @state = StateMachine::State.new(@machine, :parked)
       
       graph = GraphViz.new('G')
       @node = @state.draw(graph)
@@ -833,7 +880,7 @@ begin
   class StateDrawingFinalTest < Test::Unit::TestCase
     def setup
       @machine = StateMachine::Machine.new(Class.new)
-      @state = StateMachine::State.new(@machine, :parked)
+      @machine.states << @state = StateMachine::State.new(@machine, :parked)
       
       graph = GraphViz.new('G')
       @node = @state.draw(graph)

data/test/unit/transition_collection_test.rb

@@ -646,13 +646,11 @@ class TransitionCollectionWithDifferentActionsTest < Test::Unit::TestCase
     end
     
     @callbacks = []
-    @state.after_transition(:include_failures => true) { @callbacks << :state_after }
-    @state.around_transition(:include_failures => true) {|block| block.call; @callbacks << :state_around }
-    @status.after_transition(:include_failures => true) { @callbacks << :status_after }
-    @status.around_transition(:include_failures => true) {|block| block.call; @callbacks << :status_around }
+    @state.after_failure { @callbacks << :state_after }
+    @status.after_failure { @callbacks << :status_after }
     
     @transitions.perform
-    assert_equal [:status_around, :status_after, :state_around, :state_after], @callbacks
+    assert_equal [:status_after, :state_after], @callbacks
   end
   
   def test_should_run_after_failure_callbacks_if_action_fails_for_second_transition
@@ -663,13 +661,11 @@ class TransitionCollectionWithDifferentActionsTest < Test::Unit::TestCase
     end
     
     @callbacks = []
-    @state.after_transition(:include_failures => true) { @callbacks << :state_after }
-    @state.around_transition(:include_failures => true) {|block| block.call; @callbacks << :state_around }
-    @status.after_transition(:include_failures => true) { @callbacks << :status_after }
-    @status.around_transition(:include_failures => true) {|block| block.call; @callbacks << :status_around }
+    @state.after_failure { @callbacks << :state_after }
+    @status.after_failure { @callbacks << :status_after }
     
     @transitions.perform
-    assert_equal [:status_around, :status_after, :state_around, :state_after], @callbacks
+    assert_equal [:status_after, :state_after], @callbacks
   end
 end
 
@@ -769,6 +765,7 @@ class TransitionCollectionWithActionFailedTest < Test::Unit::TestCase
     @around_before_count = 0
     @after_count = 0
     @around_after_count = 0
+    @failure_count = 0
     
     @machine = StateMachine::Machine.new(@klass, :initial => :parked, :action => :save)
     @machine.state :idling
@@ -776,9 +773,8 @@ class TransitionCollectionWithActionFailedTest < Test::Unit::TestCase
     
     @machine.before_transition {@before_count += 1}
     @machine.after_transition {@after_count += 1}
-    @machine.after_transition(:include_failures => true) {@after_count += 1}
     @machine.around_transition {|block| @around_before_count += 1; block.call; @around_after_count += 1}
-    @machine.around_transition(:include_failures => true) {|block| @around_before_count += 1; block.call; @around_after_count += 1}
+    @machine.after_failure {@failure_count += 1}
     
     @object = @klass.new
     
@@ -801,15 +797,19 @@ class TransitionCollectionWithActionFailedTest < Test::Unit::TestCase
   end
   
   def test_should_run_around_callbacks_before_yield
-    assert_equal 2, @around_before_count
+    assert_equal 1, @around_before_count
   end
   
-  def test_should_only_run_after_callbacks_that_include_failures
-    assert_equal 1, @after_count
+  def test_should_not_run_after_callbacks
+    assert_equal 0, @after_count
+  end
+  
+  def test_should_not_run_around_callbacks
+    assert_equal 0, @around_after_count
   end
   
-  def test_should_only_run_around_callbacks_after_yield_that_include_failures
-    assert_equal 1, @around_after_count
+  def test_should_run_failure_callbacks
+    assert_equal 1, @failure_count
   end
 end
 
@@ -824,6 +824,7 @@ class TransitionCollectionWithActionErrorTest < Test::Unit::TestCase
     @around_before_count = 0
     @after_count = 0
     @around_after_count = 0
+    @failure_count = 0
     
     @machine = StateMachine::Machine.new(@klass, :initial => :parked, :action => :save)
     @machine.state :idling
@@ -831,9 +832,8 @@ class TransitionCollectionWithActionErrorTest < Test::Unit::TestCase
     
     @machine.before_transition {@before_count += 1}
     @machine.after_transition {@after_count += 1}
-    @machine.after_transition(:include_failures => true) {@after_count += 1}
     @machine.around_transition {|block| @around_before_count += 1; block.call; @around_after_count += 1}
-    @machine.around_transition(:include_failures => true) {|block| @around_before_count += 1; block.call; @around_after_count += 1}
+    @machine.after_failure {@failure_count += 1}
     
     @object = @klass.new
     
@@ -862,7 +862,7 @@ class TransitionCollectionWithActionErrorTest < Test::Unit::TestCase
   end
   
   def test_should_run_around_callbacks_before_yield
-    assert_equal 2, @around_before_count
+    assert_equal 1, @around_before_count
   end
   
   def test_should_not_run_after_callbacks
@@ -872,6 +872,10 @@ class TransitionCollectionWithActionErrorTest < Test::Unit::TestCase
   def test_should_not_run_around_callbacks_after_yield
     assert_equal 0, @around_after_count
   end
+  
+  def test_should_not_run_failure_callbacks
+    assert_equal 0, @failure_count
+  end
 end
 
 class TransitionCollectionWithCallbacksTest < Test::Unit::TestCase
@@ -891,15 +895,15 @@ class TransitionCollectionWithCallbacksTest < Test::Unit::TestCase
     @state.state :idling
     @state.event :ignite
     @state.before_transition {@before_callbacks << :state_before}
-    @state.after_transition(:include_failures => true) {@after_callbacks << :state_after}
-    @state.around_transition(:include_failures => true) {|block| @before_callbacks << :state_around; block.call; @after_callbacks << :state_around}
+    @state.after_transition {@after_callbacks << :state_after}
+    @state.around_transition {|block| @before_callbacks << :state_around; block.call; @after_callbacks << :state_around}
     
     @status = StateMachine::Machine.new(@klass, :status, :initial => :first_gear, :action => :save)
     @status.state :second_gear
     @status.event :shift_up
     @status.before_transition {@before_callbacks << :status_before}
-    @status.after_transition(:include_failures => true) {@after_callbacks << :status_after}
-    @status.around_transition(:include_failures => true) {|block| @before_callbacks << :status_around; block.call; @after_callbacks << :status_around}
+    @status.after_transition {@after_callbacks << :status_after}
+    @status.around_transition {|block| @before_callbacks << :status_around; block.call; @after_callbacks << :status_around}
     
     @object = @klass.new
     @transitions = StateMachine::TransitionCollection.new([
@@ -947,14 +951,14 @@ class TransitionCollectionWithCallbacksTest < Test::Unit::TestCase
   end
   
   def test_should_not_halt_if_after_callback_halted_for_first_transition
-    @state.after_transition(:include_failures => true) {throw :halt}
+    @state.after_transition {throw :halt}
     
     assert_equal true, @transitions.perform
     assert_equal [:status_around, :status_after, :state_around, :state_after], @after_callbacks
   end
   
   def test_should_not_halt_if_around_callback_halted_for_second_transition
-    @status.around_transition(:include_failures => true) {|block| block.call; throw :halt}
+    @status.around_transition {|block| block.call; throw :halt}
     
     assert_equal true, @transitions.perform
     assert_equal [:state_around, :state_after], @after_callbacks
@@ -1152,7 +1156,7 @@ class TransitionCollectionWithSkippedAfterCallbacksTest < Test::Unit::TestCase
   end
 end
 
-class TransitionCollectionWithActionHelperBaseTest < Test::Unit::TestCase
+class TransitionCollectionWithActionHookBaseTest < Test::Unit::TestCase
   def setup
     @superclass = Class.new do
       def save
@@ -1185,7 +1189,7 @@ class TransitionCollectionWithActionHelperBaseTest < Test::Unit::TestCase
   end
 end
 
-class TransitionCollectionWithActionHelperAndSkippedActionTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookAndSkippedActionTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super
     @result = StateMachine::TransitionCollection.new([@transition], :actions => false).perform
@@ -1200,7 +1204,7 @@ class TransitionCollectionWithActionHelperAndSkippedActionTest < TransitionColle
   end
 end
 
-class TransitionCollectionWithActionHelperAndSkippedAfterCallbacksTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookAndSkippedAfterCallbacksTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super
     @result = StateMachine::TransitionCollection.new([@transition], :after => false).perform
@@ -1235,7 +1239,7 @@ class TransitionCollectionWithActionHelperAndSkippedAfterCallbacksTest < Transit
   end
 end
 
-class TransitionCollectionWithActionHelperAndBlockTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookAndBlockTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super
     @result = StateMachine::TransitionCollection.new([@transition]).perform { true }
@@ -1250,7 +1254,7 @@ class TransitionCollectionWithActionHelperAndBlockTest < TransitionCollectionWit
   end
 end
 
-class TransitionCollectionWithActionHelperInvalidTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookInvalidTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super
     @result = StateMachine::TransitionCollection.new([@transition, nil]).perform
@@ -1265,15 +1269,15 @@ class TransitionCollectionWithActionHelperInvalidTest < TransitionCollectionWith
   end
 end
 
-class TransitionCollectionWithActionHelperWithNilActionTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookWithNilActionTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super
     
-    @machine = StateMachine::Machine.new(@klass, :status, :initial => :parked)
-    @machine.state :idling
-    @machine.event :ignite
+    @machine = StateMachine::Machine.new(@klass, :status, :initial => :first_gear)
+    @machine.state :second_gear
+    @machine.event :shift_up
     
-    @result = StateMachine::TransitionCollection.new([@transition, StateMachine::Transition.new(@object, @machine, :ignite, :parked, :idling)]).perform
+    @result = StateMachine::TransitionCollection.new([@transition, StateMachine::Transition.new(@object, @machine, :shift_up, :first_gear, :second_gear)]).perform
   end
   
   def test_should_succeed
@@ -1305,7 +1309,7 @@ class TransitionCollectionWithActionHelperWithNilActionTest < TransitionCollecti
   end
 end
 
-class TransitionCollectionWithActionHelperWithDifferentActionsTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookWithDifferentActionsTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super
     
@@ -1315,11 +1319,11 @@ class TransitionCollectionWithActionHelperWithDifferentActionsTest < TransitionC
       end
     end
     
-    @machine = StateMachine::Machine.new(@klass, :status, :initial => :parked, :action => :save_status)
-    @machine.state :idling
-    @machine.event :ignite
+    @machine = StateMachine::Machine.new(@klass, :status, :initial => :first_gear, :action => :save_status)
+    @machine.state :second_gear
+    @machine.event :shift_up
     
-    @result = StateMachine::TransitionCollection.new([@transition, StateMachine::Transition.new(@object, @machine, :ignite, :parked, :idling)]).perform
+    @result = StateMachine::TransitionCollection.new([@transition, StateMachine::Transition.new(@object, @machine, :shift_up, :first_gear, :second_gear)]).perform
   end
   
   def test_should_succeed
@@ -1351,7 +1355,7 @@ class TransitionCollectionWithActionHelperWithDifferentActionsTest < TransitionC
   end
 end
 
-class TransitionCollectionWithActionHelperTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super
     @result = StateMachine::TransitionCollection.new([@transition]).perform
@@ -1394,7 +1398,7 @@ class TransitionCollectionWithActionHelperTest < TransitionCollectionWithActionH
   end
 end
 
-class TransitionCollectionWithActionHelperMultipleTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookMultipleTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super
     
@@ -1469,7 +1473,7 @@ class TransitionCollectionWithActionHelperMultipleTest < TransitionCollectionWit
   end
 end
 
-class TransitionCollectionWithActionHelperErrorTest < TransitionCollectionWithActionHelperBaseTest
+class TransitionCollectionWithActionHookErrorTest < TransitionCollectionWithActionHookBaseTest
   def setup
     super