state_machine 1.1.2 → 1.2.0

data/test/unit/integrations/base_test.rb

@@ -13,6 +13,10 @@ module BaseTest
       assert !StateMachine::Integrations::Base.available?
     end
     
+    def test_should_not_have_any_matching_ancestors
+      assert_equal [], StateMachine::Integrations::Base.matching_ancestors
+    end
+    
     def test_should_not_match_any_classes
       assert !StateMachine::Integrations::Base.matches?(Class.new)
     end
@@ -67,7 +71,7 @@ module BaseTest
         end
       end
       
-      version1 = @integration.version '1.0' do
+      @integration.version '1.0' do
         def self.active?
           true
         end
@@ -77,7 +81,7 @@ module BaseTest
         end
       end
       
-      version2 = @integration.version '2.0' do
+      @integration.version '2.0' do
         def self.active?
           false
         end
@@ -94,6 +98,7 @@ module BaseTest
     
     def teardown
       StateMachine::Integrations.send(:remove_const, 'Custom')
+      super
     end
   end
 end

data/test/unit/integrations/data_mapper_test.rb

@@ -1,16 +1,16 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
 require 'dm-core'
-require 'dm-core/version' unless defined?(::DataMapper::VERSION)
+require 'dm-core/version' unless defined?(DataMapper::VERSION)
 require 'dm-observer'
 
-if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
+if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.10.3')
   require 'dm-migrations'
 end
 
 # Establish database connection
 DataMapper.setup(:default, 'sqlite3::memory:')
-DataObjects::Sqlite3.logger = DataObjects::Logger.new("#{File.dirname(__FILE__)}/../../data_mapper.log", :info)
+DataObjects::Sqlite3.logger = DataObjects::Logger.new("#{File.dirname(__FILE__)}/../../data_mapper.log", :debug)
 
 module DataMapperTest
   class BaseTestCase < Test::Unit::TestCase
@@ -18,14 +18,16 @@ module DataMapperTest
     end
     
     def teardown
-      @resources.uniq.each {|resource| DataMapperTest.send(:remove_const, resource)} if @resources
+      super
+      @resources.uniq.each {|resource| DataMapperTest.send(:remove_const, resource)} if instance_variable_defined?('@resources')
     end
     
     protected
       # Creates a new DataMapper resource (and the associated table)
       def new_resource(create_table = :foo, &block)
-        table_name = create_table || :foo
-        name = table_name.to_s.capitalize
+        base_table_name = create_table || :foo
+        name = base_table_name.to_s.capitalize
+        table_name = "#{base_table_name}_#{rand(1000000)}"
         
         resource = Class.new
         DataMapperTest.send(:remove_const, name) if DataMapperTest.const_defined?(name)
@@ -74,7 +76,7 @@ module DataMapperTest
     end
     
     def test_should_have_defaults
-      assert_equal e = {:action => :save, :use_transactions => false}, StateMachine::Integrations::DataMapper.defaults
+      assert_equal({:action => :save, :use_transactions => false}, StateMachine::Integrations::DataMapper.defaults)
     end
     
     def test_should_not_have_a_locale_path
@@ -114,10 +116,10 @@ module DataMapperTest
     end
     
     def test_should_define_field_with_string_type
-      property = @resource.properties.detect {|property| property.name == :status}
+      property = @resource.properties.detect {|p| p.name == :status}
       assert_not_nil property
       
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('1.0.0')
+      if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('1.0.0')
         assert_instance_of DataMapper::Property::String, property
       else
         assert_equal String, property.type
@@ -134,10 +136,10 @@ module DataMapperTest
     end
     
     def test_should_not_redefine_field
-      property = @resource.properties.detect {|property| property.name == :status}
+      property = @resource.properties.detect {|p| p.name == :status}
       assert_not_nil property
       
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('1.0.0')
+      if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('1.0.0')
         assert_instance_of DataMapper::Property::Integer, property
       else
         assert_equal Integer, property.type
@@ -182,7 +184,7 @@ module DataMapperTest
   
   class MachineWithStaticInitialStateTest < BaseTestCase
     def setup
-      @resource = new_resource do
+      @resource = new_resource(:vehicle) do
         attr_accessor :value
       end
       @machine = StateMachine::Machine.new(@resource, :initial => :parked)
@@ -211,7 +213,7 @@ module DataMapperTest
     
     def test_should_not_allow_initialize_blocks
       block_args = nil
-      record = @resource.new do |*args|
+      @resource.new do |*args|
         block_args = args
       end
       
@@ -222,6 +224,7 @@ module DataMapperTest
       @resource.class_eval do
         attr_accessor :state_during_setter
         
+        remove_method :value=
         define_method(:value=) do |value|
           self.state_during_setter = state
         end
@@ -240,6 +243,20 @@ module DataMapperTest
       assert_equal 'idling', record.state
     end
     
+    def test_should_persist_initial_state
+      record = @resource.new
+      record.save
+      record.reload
+      assert_equal 'parked', record.state
+    end
+    
+    def test_should_persist_initial_state_on_dup
+      record = @resource.create.dup
+      record.save
+      record.reload
+      assert_equal 'parked', record.state
+    end
+    
     def test_should_use_stored_values_when_loading_from_database
       @machine.state :idling
       
@@ -253,6 +270,52 @@ module DataMapperTest
       record = @resource.get(@resource.create(:state => nil).id)
       assert_nil record.state
     end
+    
+    def test_should_use_stored_values_when_loading_for_many_association
+      @machine.state :idling
+      
+      @resource.property :owner_id, Integer
+      @resource.auto_migrate!
+      
+      owner_resource = new_resource(:owner) do
+        has n, :vehicles
+      end
+      
+      owner = owner_resource.create
+      record = @resource.new(:state => 'idling')
+      record.owner_id = owner.id
+      record.save
+      assert_equal 'idling', owner.vehicles[0].state
+    end
+    
+    def test_should_use_stored_values_when_loading_for_one_association
+      @machine.state :idling
+      
+      @resource.property :owner_id, Integer
+      @resource.auto_migrate!
+      
+      owner_resource = new_resource(:owner) do
+        has 1, :vehicle
+      end
+      
+      owner = owner_resource.create
+      record = @resource.new(:state => 'idling')
+      record.owner_id = owner.id
+      record.save
+      assert_equal 'idling', owner.vehicle.state
+    end
+    
+    def test_should_use_stored_values_when_loading_for_belongs_to_association
+      @machine.state :idling
+      
+      driver_resource = new_resource(:driver) do
+        belongs_to :vehicle
+      end
+      
+      record = @resource.create(:state => 'idling')
+      driver = driver_resource.create(:vehicle_id => record.id)
+      assert_equal 'idling', driver.vehicle.state
+    end
   end
   
   class MachineWithDynamicInitialStateTest < BaseTestCase
@@ -276,7 +339,7 @@ module DataMapperTest
     
     def test_should_not_allow_initialize_blocks
       block_args = nil
-      record = @resource.new do |*args|
+      @resource.new do |*args|
         block_args = args
       end
       
@@ -287,6 +350,7 @@ module DataMapperTest
       @resource.class_eval do
         attr_accessor :state_during_setter
         
+        remove_method :value=
         define_method(:value=) do |value|
           self.state_during_setter = state || 'nil'
         end
@@ -305,6 +369,20 @@ module DataMapperTest
       assert_equal 'idling', record.state
     end
     
+    def test_should_persist_initial_state
+      record = @resource.new
+      record.save
+      record.reload
+      assert_equal 'parked', record.state
+    end
+    
+    def test_should_persist_initial_state_on_dup
+      record = @resource.create.dup
+      record.save
+      record.reload
+      assert_equal 'parked', record.state
+    end
+    
     def test_should_use_stored_values_when_loading_from_database
       @machine.state :idling
       
@@ -332,8 +410,35 @@ module DataMapperTest
     end
   end
   
-  class MachineWithColumnDefaultTest < BaseTestCase
+  class MachineWithSameColumnDefaultTest < BaseTestCase
     def setup
+      @original_stderr, $stderr = $stderr, StringIO.new
+      
+      @resource = new_resource do
+        property :status, String, :default => 'parked'
+      end
+      @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
+      @record = @resource.new
+    end
+    
+    def test_should_use_machine_default
+      assert_equal 'parked', @record.status
+    end
+    
+    def test_should_not_generate_a_warning
+      assert_no_match(/have defined a different default/, $stderr.string)
+    end
+    
+    def teardown
+      $stderr = @original_stderr
+      super
+    end
+  end
+  
+  class MachineWithDifferentColumnDefaultTest < BaseTestCase
+    def setup
+      @original_stderr, $stderr = $stderr, StringIO.new
+      
       @resource = new_resource do
         property :status, String, :default => 'idling'
       end
@@ -344,6 +449,41 @@ module DataMapperTest
     def test_should_use_machine_default
       assert_equal 'parked', @record.status
     end
+    
+    def test_should_generate_a_warning
+      assert_match(/Both DataMapperTest::Foo and its :status machine have defined a different default for "status". Use only one or the other for defining defaults to avoid unexpected behaviors\./, $stderr.string)
+    end
+    
+    def teardown
+      $stderr = @original_stderr
+      super
+    end
+  end
+  
+  class MachineWithDifferentIntegerColumnDefaultTest < BaseTestCase
+    def setup
+      @original_stderr, $stderr = $stderr, StringIO.new
+      
+      @resource = new_resource do
+        property :status, Integer, :default => 0
+      end
+      @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
+      @machine.state :parked, :value => 1
+      @record = @resource.new
+    end
+    
+    def test_should_use_machine_default
+      assert_equal 1, @record.status
+    end
+    
+    def test_should_generate_a_warning
+      assert_match(/Both DataMapperTest::Foo and its :status machine have defined a different default for "status". Use only one or the other for defining defaults to avoid unexpected behaviors\./, $stderr.string)
+    end
+    
+    def teardown
+      $stderr = @original_stderr
+      super
+    end
   end
   
   class MachineWithConflictingPredicateTest < BaseTestCase
@@ -375,14 +515,14 @@ module DataMapperTest
       @machine = StateMachine::Machine.new(@resource)
       @machine.state :state
       
-      assert_match /^Instance method "state\?" is already defined in DataMapperTest::Foo :state instance helpers, use generic helper instead.*\n$/, $stderr.string
+      assert_match(/^Instance method "state\?" is already defined in DataMapperTest::Foo :state instance helpers, use generic helper instead.*\n$/, $stderr.string)
     end
     
-    def test_should_not_output_warning_with_same_machine_name
+    def test_should_not_output_warning_with_same_machine_attribute
       @machine = StateMachine::Machine.new(@resource, :public_state, :attribute => :state)
       @machine.state :state
       
-      assert_equal '', $stderr.string
+      assert_no_match(/^Instance method "state\?" is already defined.*\n$/, $stderr.string)
     end
     
     def teardown
@@ -415,8 +555,7 @@ module DataMapperTest
     end
     
     def test_should_raise_exception_for_predicate_without_parameters
-      exception = assert_raise(ArgumentError) { @record.state? }
-      assert_equal 'wrong number of arguments (1 for 2)', exception.message
+      assert_raise(ArgumentError) { @record.state? }
     end
     
     def test_should_return_false_for_predicate_if_does_not_match_current_value
@@ -524,7 +663,7 @@ module DataMapperTest
       assert_equal 'idling', record.state
     end
     
-    if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.9.8')
+    if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.9.8')
       def test_should_raise_exception_if_protected
         resource = new_resource do
           protected :state=
@@ -595,14 +734,14 @@ module DataMapperTest
     end
     
     def test_should_include_state_in_changed_attributes
-      assert_equal e = {@resource.properties[:state] => 'idling'}, @record.dirty_attributes
+      assert_equal({@resource.properties[:state] => 'idling'}, @record.dirty_attributes)
     end
     
     def test_should_track_attribute_change
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
+      if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal({@resource.properties[:state] => 'parked'}, @record.original_attributes)
       else
-        assert_equal e = {:state => 'parked'},  @record.original_values
+        assert_equal({:state => 'parked'},  @record.original_values)
       end
     end
     
@@ -610,10 +749,10 @@ module DataMapperTest
       transition = StateMachine::Transition.new(@record, @machine, :ignite, :idling, :idling)
       transition.perform(false)
       
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
+      if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal({@resource.properties[:state] => 'parked'}, @record.original_attributes)
       else
-        assert_equal e = {:state => 'parked'},  @record.original_values
+        assert_equal({:state => 'parked'},  @record.original_values)
       end
     end
     
@@ -636,14 +775,14 @@ module DataMapperTest
     end
     
     def test_should_not_include_state_in_changed_attributes
-      assert_equal e = {}, @record.dirty_attributes
+      assert_equal({}, @record.dirty_attributes)
     end
   end
   
   class MachineWithDirtyAttributesAndCustomAttributeTest < BaseTestCase
     def setup
       @resource = new_resource do
-        property :status, String, :default => 'idling'
+        property :status, String
       end
       @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
       @machine.event :ignite
@@ -656,14 +795,14 @@ module DataMapperTest
     end
     
     def test_should_include_state_in_changed_attributes
-      assert_equal e = {@resource.properties[:status] => 'idling'}, @record.dirty_attributes
+      assert_equal({@resource.properties[:status] => 'idling'}, @record.dirty_attributes)
     end
     
     def test_should_track_attribute_change
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {@resource.properties[:status] => 'parked'}, @record.original_attributes
+      if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal({@resource.properties[:status] => 'parked'}, @record.original_attributes)
       else
-        assert_equal e = {:status => 'parked'},  @record.original_values
+        assert_equal({:status => 'parked'},  @record.original_values)
       end
     end
     
@@ -671,10 +810,10 @@ module DataMapperTest
       transition = StateMachine::Transition.new(@record, @machine, :ignite, :idling, :idling)
       transition.perform(false)
       
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {@resource.properties[:status] => 'parked'}, @record.original_attributes
+      if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal({@resource.properties[:status] => 'parked'}, @record.original_attributes)
       else
-        assert_equal e = {:status => 'parked'},  @record.original_values
+        assert_equal({:status => 'parked'},  @record.original_values)
       end
     end
   end
@@ -682,7 +821,7 @@ module DataMapperTest
   class MachineWithDirtyAttributeAndCustomAttributesDuringLoopbackTest < BaseTestCase
     def setup
       @resource = new_resource do
-        property :status, String, :default => 'idling'
+        property :status, String
       end
       @machine = StateMachine::Machine.new(@resource, :status, :initial => :parked)
       @machine.event :park
@@ -694,7 +833,7 @@ module DataMapperTest
     end
     
     def test_should_not_include_state_in_changed_attributes
-      assert_equal e = {}, @record.dirty_attributes
+      assert_equal({}, @record.dirty_attributes)
     end
   end
   
@@ -709,14 +848,14 @@ module DataMapperTest
     end
     
     def test_should_not_include_state_in_changed_attributes
-      assert_equal e = {}, @record.dirty_attributes
+      assert_equal({}, @record.dirty_attributes)
     end
     
     def test_should_not_track_attribute_change
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {}, @record.original_attributes
+      if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+        assert_equal({}, @record.original_attributes)
       else
-        assert_equal e = {},  @record.original_values
+        assert_equal({},  @record.original_values)
       end
     end
   end
@@ -747,7 +886,7 @@ module DataMapperTest
   end
   
   begin
-    if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
+    if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.10.3')
       require 'dm-transactions'
     end
     
@@ -848,12 +987,22 @@ module DataMapperTest
     
     def test_should_run_around_callbacks
       before_called = false
-      after_called = [false]
-      @machine.around_transition {|block| before_called = true; block.call; after_called[0] = true}
+      after_called = false
+      ensure_called = 0
+      @machine.around_transition do |block|
+        before_called = true
+        begin
+          block.call
+        ensure
+          ensure_called += 1
+        end
+        after_called = true
+      end
       
       @transition.perform
       assert before_called
-      assert after_called[0]
+      assert after_called
+      assert_equal ensure_called, 1
     end
     
     def test_should_run_around_callbacks_with_the_context_of_the_record
@@ -888,6 +1037,36 @@ module DataMapperTest
       
       assert_equal [1, 2, 3], @record.callback_result
     end
+    
+    def test_should_run_in_expected_order
+      # Avoid Ruby 2.0.0 stack too deep issues
+      @resource.class_eval do
+        def valid?(*)
+          super
+        end
+      end
+      
+      expected = [
+        :before_transition, :before_validation, :after_validation,
+        :before_save, :before_create, :after_create, :after_save,
+        :after_transition
+      ]
+      
+      callbacks = []
+      @resource.before(:valid?) { callbacks << :before_validation }
+      @resource.after(:valid?) { callbacks << :after_validation }
+      @resource.before(:save) { callbacks << :before_save }
+      @resource.before(:create) { callbacks << :before_create }
+      @resource.after(:create) { callbacks << :after_create }
+      @resource.after(:save) { callbacks << :after_save }
+      
+      @machine.before_transition { callbacks << :before_transition }
+      @machine.after_transition { callbacks << :after_transition }
+      
+      @transition.perform
+      
+      assert_equal expected, callbacks
+    end
   end
   
   class MachineWithFailedBeforeCallbacksTest < BaseTestCase
@@ -927,6 +1106,42 @@ module DataMapperTest
     end
   end
   
+  if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('1.0.0')
+    class MachineNestedActionTest < BaseTestCase
+      def setup
+        @callbacks = []
+        
+        @resource = new_resource
+        @machine = StateMachine::Machine.new(@resource)
+        @machine.event :ignite do
+          transition :parked => :idling
+        end
+        
+        @record = @resource.new(:state => 'parked')
+      end
+      
+      def test_should_allow_transition_prior_to_creation_if_skipping_action
+        record = @record
+        @resource.before(:create) { record.ignite }
+        result = @record.save
+        
+        assert_equal true, result
+        assert_equal "idling", @record.state
+        @record.reload
+        assert_equal "idling", @record.state
+      end
+      
+      def test_should_not_allow_transition_after_creation
+        record = @record
+        @resource.after(:create) { record.ignite(false) }
+        
+        result = @record.save
+        
+        assert_equal false, result
+      end
+    end
+  end
+  
   class MachineWithFailedActionTest < BaseTestCase
     def setup
       @resource = new_resource do
@@ -968,7 +1183,7 @@ module DataMapperTest
   end
   
   class MachineWithFailedAfterCallbacksTest < BaseTestCase
-     def setup
+    def setup
       callbacks = []
       
       @resource = new_resource
@@ -1122,7 +1337,7 @@ module DataMapperTest
     end
     
     # See README caveats
-    if Gem::Version.new(::DataMapper::VERSION) > Gem::Version.new('0.9.6')
+    if Gem::Version.new(DataMapper::VERSION) > Gem::Version.new('0.9.6')
       class MachineWithEventAttributesOnValidationTest < BaseTestCase
         def setup
           @resource = new_resource
@@ -1164,7 +1379,11 @@ module DataMapperTest
           ran_callback = false
           @machine.around_transition {|block| ran_callback = true; block.call }
           
-          @record.valid?
+          begin
+            @record.valid?
+          rescue ArgumentError
+            raise if StateMachine::Transition.pause_supported?
+          end
           assert ran_callback
         end
         
@@ -1219,7 +1438,11 @@ module DataMapperTest
           ran_callback = [false]
           @machine.around_transition {|block| block.call; ran_callback[0] = true }
           
-          @record.valid?
+          begin
+            @record.valid?
+          rescue ArgumentError
+            raise if StateMachine::Transition.pause_supported?
+          end
           assert !ran_callback[0]
         end
         
@@ -1236,7 +1459,11 @@ module DataMapperTest
           ran_callback = [false]
           @machine.around_transition {|block| block.call; ran_callback[0] = true }
           
-          @record.valid?
+          begin
+            @record.valid?
+          rescue ArgumentError
+            raise if StateMachine::Transition.pause_supported?
+          end
           assert !ran_callback[0]
         end
         
@@ -1378,10 +1605,38 @@ module DataMapperTest
           assert_equal false, @record.save
           assert_equal 1, @resource.all.size
         end
+        
+        def test_should_allow_additional_transitions_to_new_state_in_after_transitions
+          @machine.event :park do
+            transition :idling => :parked
+          end
+          
+          @machine.after_transition(:on => :ignite) { park }
+          
+          @record.save
+          assert_equal 'parked', @record.state
+          
+          @record.reload
+          assert_equal 'parked', @record.state
+        end
+        
+        def test_should_allow_additional_transitions_to_previous_state_in_after_transitions
+          @machine.event :shift_up do
+            transition :idling => :first_gear
+          end
+          
+          @machine.after_transition(:on => :ignite) { shift_up }
+          
+          @record.save
+          assert_equal 'first_gear', @record.state
+          
+          @record.reload
+          assert_equal 'first_gear', @record.state
+        end
       end
     end
     
-    if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
+    if Gem::Version.new(DataMapper::VERSION) >= Gem::Version.new('0.10.0')
       class MachineWithEventAttributesOnSaveBangTest < BaseTestCase
         def setup
           @resource = new_resource
@@ -1464,7 +1719,7 @@ module DataMapperTest
       end
     end
     
-    if Gem::Version.new(::DataMapper::VERSION) > Gem::Version.new('0.9.6')
+    if Gem::Version.new(DataMapper::VERSION) > Gem::Version.new('0.9.6')
       class MachineWithEventAttributesOnCustomActionTest < BaseTestCase
         def setup
           @superclass = new_resource do
@@ -1526,7 +1781,7 @@ module DataMapperTest
     def test_should_call_before_transition_callback_if_requirements_match
       called = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         before_transition :from => :parked do
           called = true
         end
@@ -1539,7 +1794,7 @@ module DataMapperTest
     def test_should_not_call_before_transition_callback_if_requirements_do_not_match
       called = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         before_transition :from => :idling do
           called = true
         end
@@ -1552,7 +1807,7 @@ module DataMapperTest
     def test_should_pass_transition_to_before_callbacks
       callback_args = nil
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         before_transition do |*args|
           callback_args = args
         end
@@ -1565,7 +1820,7 @@ module DataMapperTest
     def test_should_call_after_transition_callback_if_requirements_match
       called = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         after_transition :from => :parked do
           called = true
         end
@@ -1578,7 +1833,7 @@ module DataMapperTest
     def test_should_not_call_after_transition_callback_if_requirements_do_not_match
       called = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         after_transition :from => :idling do
           called = true
         end
@@ -1591,7 +1846,7 @@ module DataMapperTest
     def test_should_pass_transition_to_after_callbacks
       callback_args = nil
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         after_transition do |*args|
           callback_args = args
         end
@@ -1604,7 +1859,7 @@ module DataMapperTest
     def test_should_call_around_transition_callback_if_requirements_match
       called = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         around_transition :from => :parked do |block|
           called = true
           block.call
@@ -1615,10 +1870,10 @@ module DataMapperTest
       assert called
     end
     
-    def test_should_not_call_after_transition_callback_if_requirements_do_not_match
+    def test_should_not_call_around_transition_callback_if_requirements_do_not_match
       called = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         around_transition :from => :idling do |block|
           called = true
           block.call
@@ -1632,7 +1887,7 @@ module DataMapperTest
     def test_should_pass_transition_to_around_callbacks
       callback_args = nil
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         around_transition do |*args|
           block = args.pop
           callback_args = args
@@ -1649,7 +1904,7 @@ module DataMapperTest
       
       called = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         after_transition_failure :on => :ignite do
           called = true
         end
@@ -1664,7 +1919,7 @@ module DataMapperTest
       
       called = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         after_transition_failure :on => :park do
           called = true
         end
@@ -1679,7 +1934,7 @@ module DataMapperTest
       
       callback_args = nil
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         after_transition_failure do |*args|
           callback_args = args
         end
@@ -1705,7 +1960,7 @@ module DataMapperTest
       called_state = false
       called_status = false
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         before_transition :state, :from => :parked do
           called_state = true
         end
@@ -1729,8 +1984,7 @@ module DataMapperTest
       
       called_attribute = nil
       
-      attributes = []
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         before_transition :state, :status, :from => :parked do |transition|
           called_attribute = transition.attribute
         end
@@ -1764,7 +2018,7 @@ module DataMapperTest
         notifications << :callback_around_after_transition
       end
       
-      observer = new_observer(@resource) do
+      new_observer(@resource) do
         before_transition do
           notifications << :observer_before_transition
         end
@@ -1813,7 +2067,7 @@ module DataMapperTest
     
     def test_should_only_include_records_with_state_in_singular_with_scope
       parked = @resource.create :state => 'parked'
-      idling = @resource.create :state => 'idling'
+      @resource.create :state => 'idling'
       
       assert_equal [parked], @resource.with_state(:parked)
     end