state_machine 1.0.3 → 1.1.0

data/test/unit/integrations/data_mapper_test.rb

@@ -538,8 +538,8 @@ module DataMapperTest
       @transition.perform
     end
     
-    def test_should_update_record
-      assert_not_equal @timestamp, @record.updated_at
+    def test_should_not_update_record
+      assert_equal @timestamp, @record.updated_at
     end
   end
   
@@ -579,10 +579,10 @@ module DataMapperTest
       end
     end
     
-      def test_should_have_changes_when_loaded_from_database
-        record = @resource.get(@record.id)
-        assert record.dirty_attributes.empty?
-      end
+    def test_should_not_have_changes_when_loaded_from_database
+      record = @resource.get(@record.id)
+      assert record.dirty_attributes.empty?
+    end
   end
   
   class MachineWithDirtyAttributesDuringLoopbackTest < BaseTestCase
@@ -597,18 +597,8 @@ module DataMapperTest
       @transition.perform(false)
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal e = {@resource.properties[:state] => 'parked'}, @record.dirty_attributes
-    end
-    
-    def test_should_track_attribute_change
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
-        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
-      elsif Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {@resource.properties[:state] => 'parked-ignored'}, @record.original_attributes
-      else
-        assert_equal e = {:state => 'parked-ignored'},  @record.original_values
-      end
+    def test_should_not_include_state_in_changed_attributes
+      assert_equal e = {}, @record.dirty_attributes
     end
   end
   
@@ -665,18 +655,8 @@ module DataMapperTest
       @transition.perform(false)
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal e = {@resource.properties[:status] => 'parked'}, @record.dirty_attributes
-    end
-    
-    def test_should_track_attribute_changes
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
-        assert_equal e = {@resource.properties[:status] => 'parked'}, @record.original_attributes
-      elsif Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {@resource.properties[:status] => 'parked-ignored'}, @record.original_attributes
-      else
-        assert_equal e = {:status => 'parked-ignored'},  @record.original_values
-      end
+    def test_should_not_include_state_in_changed_attributes
+      assert_equal e = {}, @record.dirty_attributes
     end
   end
   
@@ -690,38 +670,17 @@ module DataMapperTest
       @record.state_event = 'ignite'
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal e = {@resource.properties[:state] => 'parked'}, @record.dirty_attributes
-    end
-    
-    def test_should_track_attribute_change
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
-        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
-      elsif Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {@resource.properties[:state] => 'parked-ignored'}, @record.original_attributes
-      else
-        assert_equal e = {:state => 'parked-ignored'},  @record.original_values
-      end
+    def test_should_not_include_state_in_changed_attributes
+      assert_equal e = {}, @record.dirty_attributes
     end
     
-    def test_should_not_reset_changes_on_multiple_changes
-      @record.state_event = 'ignite'
-      
-      if Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.3')
-        assert_equal e = {@resource.properties[:state] => 'parked'}, @record.original_attributes
-      elsif Gem::Version.new(::DataMapper::VERSION) >= Gem::Version.new('0.10.0')
-        assert_equal e = {@resource.properties[:state] => 'parked-ignored'}, @record.original_attributes
+    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
       else
-        assert_equal e = {:state => 'parked-ignored'},  @record.original_values
+        assert_equal e = {},  @record.original_values
       end
     end
-    
-    def test_should_not_include_state_in_changed_attributes_if_nil
-      @record = @resource.create
-      @record.state_event = nil
-      
-      assert_equal e = {}, @record.dirty_attributes
-    end
   end
   
   class MachineWithoutTransactionsTest < BaseTestCase
@@ -1073,6 +1032,24 @@ module DataMapperTest
       end
     end
     
+    class MachineErrorsTest < BaseTestCase
+      def setup
+        @resource = new_resource
+        @machine = StateMachine::Machine.new(@resource)
+        @record = @resource.new
+      end
+      
+      def test_should_be_able_to_describe_current_errors
+        @record.errors.add(:id, 'cannot be blank')
+        @record.errors.add(:state, 'is invalid')
+        assert_equal ['id cannot be blank', 'state is invalid'], @machine.errors_for(@record).split(', ').sort
+      end
+      
+      def test_should_describe_as_halted_with_no_errors
+        assert_equal 'Transition halted', @machine.errors_for(@record)
+      end
+    end
+    
     class MachineWithStateDrivenValidationsTest < BaseTestCase
       def setup
         @resource = resource = new_resource do

data/test/unit/integrations/mongo_mapper_test.rb

@@ -585,12 +585,12 @@ module MongoMapperTest
       @transition.perform(false)
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal %w(state), @record.changed
+    def test_should_not_include_state_in_changed_attributes
+      assert_equal [], @record.changed
     end
     
-    def test_should_track_attribute_changes
-      assert_equal %w(parked parked), @record.changes['state']
+    def test_should_not_track_attribute_changes
+      assert_equal nil, @record.changes['state']
     end
   end
   
@@ -639,12 +639,12 @@ module MongoMapperTest
       @transition.perform(false)
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal %w(status), @record.changed
+    def test_should_not_include_state_in_changed_attributes
+      assert_equal [], @record.changed
     end
     
-    def test_should_track_attribute_changes
-      assert_equal %w(parked parked), @record.changes['status']
+    def test_should_not_track_attribute_changes
+      assert_equal nil, @record.changes['status']
     end
   end
   
@@ -658,24 +658,12 @@ module MongoMapperTest
       @record.state_event = 'ignite'
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal %w(state), @record.changed
-    end
-    
-    def test_should_track_attribute_change
-      assert_equal %w(parked parked), @record.changes['state']
-    end
-    
-    def test_should_not_reset_changes_on_multiple_changes
-      @record.state_event = 'ignite'
-      assert_equal %w(parked parked), @record.changes['state']
+    def test_should_not_include_state_in_changed_attributes
+      assert_equal [], @record.changed
     end
     
-    def test_should_not_include_state_in_changed_attributes_if_nil
-      @record = @model.create
-      @record.state_event = nil
-      
-      assert_equal [], @record.changed
+    def test_should_not_track_attribute_change
+      assert_equal nil, @record.changes['state']
     end
   end
   
@@ -1010,6 +998,24 @@ module MongoMapperTest
       assert @record.valid?
     end
   end
+  
+  class MachineErrorsTest < BaseTestCase
+    def setup
+      @model = new_model
+      @machine = StateMachine::Machine.new(@model)
+      @record = @model.new
+    end
+    
+    def test_should_be_able_to_describe_current_errors
+      @record.errors.add(:id, 'cannot be blank')
+      @record.errors.add(:state, 'is invalid')
+      assert_equal ['Id cannot be blank', 'State is invalid'], @machine.errors_for(@record).split(', ').sort
+    end
+    
+    def test_should_describe_as_halted_with_no_errors
+      assert_equal 'Transition halted', @machine.errors_for(@record)
+    end
+  end
     
   class MachineWithStateDrivenValidationsTest < BaseTestCase
     def setup

data/test/unit/integrations/mongoid_test.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
 require 'mongoid'
+require 'mongoid/version'
 
 # Establish database connection
 Mongoid.configure do |config|
@@ -124,6 +125,24 @@ module MongoidTest
       assert_equal [record], block_args
     end
     
+    def test_should_set_attributes_prior_to_initialize_block
+      state = nil
+      record = @model.new do |record|
+        state = record.state
+      end
+      
+      assert_equal 'parked', state
+    end
+    
+    def test_should_set_attributes_prior_to_after_initialize_hook
+      state = nil
+      @model.after_initialize do |record|
+        state = record.state
+      end
+      @model.new
+      assert_equal 'parked', state
+    end
+    
     def test_should_set_initial_state_before_setting_attributes
       @model.class_eval do
         attr_accessor :state_during_setter
@@ -189,6 +208,24 @@ module MongoidTest
       assert_equal [record], block_args
     end
     
+    def test_should_set_attributes_prior_to_initialize_block
+      state = nil
+      record = @model.new do |record|
+        state = record.state
+      end
+      
+      assert_equal 'parked', state
+    end
+    
+    def test_should_set_attributes_prior_to_after_initialize_hook
+      state = nil
+      @model.after_initialize do |record|
+        state = record.state
+      end
+      @model.new
+      assert_equal 'parked', state
+    end
+    
     def test_should_set_initial_state_after_setting_attributes
       @model.class_eval do
         attr_accessor :state_during_setter
@@ -575,12 +612,22 @@ module MongoidTest
       @transition.perform(false)
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal %w(state), @record.changed
-    end
-    
-    def test_should_track_attribute_changes
-      assert_equal %w(parked parked), @record.send(:attribute_change, 'state')
+    if ::Mongoid::VERSION =~ /^2\.0\./
+      def test_should_include_state_in_changed_attributes
+        assert_equal %w(state), @record.changed
+      end
+      
+      def test_should_not_track_attribute_changes
+        assert_equal %w(parked parked), @record.send(:attribute_change, 'state')
+      end
+    else
+      def test_should_not_include_state_in_changed_attributes
+        assert_equal [], @record.changed
+      end
+      
+      def test_should_not_track_attribute_changes
+        assert_equal nil, @record.send(:attribute_change, 'state')
+      end
     end
   end
   
@@ -629,12 +676,22 @@ module MongoidTest
       @transition.perform(false)
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal %w(status), @record.changed
-    end
-    
-    def test_should_track_attribute_changes
-      assert_equal %w(parked parked), @record.send(:attribute_change, 'status')
+    if ::Mongoid::VERSION =~ /^2\.0\./
+      def test_should_include_state_in_changed_attributes
+        assert_equal %w(status), @record.changed
+      end
+      
+      def test_should_track_attribute_changes
+        assert_equal %w(parked parked), @record.send(:attribute_change, 'status')
+      end
+    else
+      def test_should_include_state_in_changed_attributes
+        assert_equal [], @record.changed
+      end
+      
+      def test_should_track_attribute_changes
+        assert_equal nil, @record.send(:attribute_change, 'status')
+      end
     end
   end
   
@@ -648,24 +705,34 @@ module MongoidTest
       @record.state_event = 'ignite'
     end
     
-    def test_should_include_state_in_changed_attributes
-      assert_equal %w(state), @record.changed
-    end
-    
-    def test_should_track_attribute_change
-      assert_equal %w(parked parked), @record.send(:attribute_change, 'state')
-    end
-    
-    def test_should_not_reset_changes_on_multiple_changes
-      @record.state_event = 'ignite'
-      assert_equal %w(parked parked), @record.send(:attribute_change, 'state')
-    end
-    
-    def test_should_not_include_state_in_changed_attributes_if_nil
-      @record = @model.create
-      @record.state_event = nil
+    if ::Mongoid::VERSION =~ /^2\.0\./
+      def test_should_include_state_in_changed_attributes
+        assert_equal %w(state), @record.changed
+      end
+      
+      def test_should_track_attribute_change
+        assert_equal %w(parked parked), @record.send(:attribute_change, 'state')
+      end
+      
+      def test_should_not_reset_changes_on_multiple_changes
+        @record.state_event = 'ignite'
+        assert_equal %w(parked parked), @record.send(:attribute_change, 'state')
+      end
       
-      assert_equal [], @record.changed
+      def test_should_not_include_state_in_changed_attributes_if_nil
+        @record = @model.create
+        @record.state_event = nil
+        
+        assert_equal [], @record.changed
+      end
+    else
+      def test_should_not_include_state_in_changed_attributes
+        assert_equal [], @record.changed
+      end
+      
+      def test_should_not_track_attribute_change
+        assert_equal nil, @record.send(:attribute_change, 'state')
+      end
     end
   end
   
@@ -976,6 +1043,24 @@ module MongoidTest
       assert @record.valid?
     end
   end
+  
+  class MachineErrorsTest < BaseTestCase
+    def setup
+      @model = new_model
+      @machine = StateMachine::Machine.new(@model)
+      @record = @model.new
+    end
+    
+    def test_should_be_able_to_describe_current_errors
+      @record.errors.add(:id, 'cannot be blank')
+      @record.errors.add(:state, 'is invalid')
+      assert_equal ['Id cannot be blank', 'State is invalid'], @machine.errors_for(@record).split(', ').sort
+    end
+    
+    def test_should_describe_as_halted_with_no_errors
+      assert_equal 'Transition halted', @machine.errors_for(@record)
+    end
+  end
     
   class MachineWithStateDrivenValidationsTest < BaseTestCase
     def setup

data/test/unit/integrations/sequel_test.rb

@@ -158,6 +158,15 @@ module SequelTest
       assert_equal [record], block_args
     end
     
+    def test_should_set_attributes_prior_to_initialize_block
+      state = nil
+      record = @model.new do |record|
+        state = record.state
+      end
+      
+      assert_equal 'parked', state
+    end
+    
     def test_should_set_attributes_prior_to_after_initialize_hook
       state = nil
       @model.class_eval do
@@ -239,6 +248,15 @@ module SequelTest
       assert record.changed_columns.empty?
     end
     
+    def test_should_set_attributes_prior_to_initialize_block
+      state = nil
+      record = @model.new do |record|
+        state = record.state
+      end
+      
+      assert_equal 'parked', state
+    end
+    
     def test_should_set_attributes_prior_to_after_initialize_hook
       state = nil
       @model.class_eval do
@@ -998,6 +1016,24 @@ module SequelTest
     end
   end
   
+  class MachineErrorsTest < BaseTestCase
+    def setup
+      @model = new_model
+      @machine = StateMachine::Machine.new(@model)
+      @record = @model.new
+    end
+    
+    def test_should_be_able_to_describe_current_errors
+      @record.errors.add(:id, 'cannot be blank')
+      @record.errors.add(:state, 'is invalid')
+      assert_equal ['id cannot be blank', 'state is invalid'], @machine.errors_for(@record).split(', ').sort
+    end
+    
+    def test_should_describe_as_halted_with_no_errors
+      assert_equal 'Transition halted', @machine.errors_for(@record)
+    end
+  end
+  
   class MachineWithStateDrivenValidationsTest < BaseTestCase
     def setup
       @model = new_model do