enum_state_machine 0.9.0 → 0.10.0

data/test/unit/integrations/active_record_test.rb

@@ -450,7 +450,7 @@ module ActiveRecordTest
   
   class MachineWithSameColumnDefaultTest < BaseTestCase
     def setup
-      @original_stderr, $stderr = $stderr, StringIO.new
+      set_rails_logger(@io = StringIO.new)
       
       @model = new_model do
         connection.add_column table_name, :status, :string, :default => 'parked'
@@ -464,18 +464,18 @@ module ActiveRecordTest
     end
     
     def test_should_not_generate_a_warning
-      assert_no_match(/have defined a different default/, $stderr.string)
+      assert_no_match(/have defined a different default/, @io.string)
     end
     
     def teardown
-      $stderr = @original_stderr
+      reset_rails_logger
       super
     end
   end
   
   class MachineWithDifferentColumnDefaultTest < BaseTestCase
     def setup
-      @original_stderr, $stderr = $stderr, StringIO.new
+      set_rails_logger(@io = StringIO.new)
       
       @model = new_model do
         connection.add_column table_name, :status, :string, :default => 'idling'
@@ -489,18 +489,18 @@ module ActiveRecordTest
     end
     
     def test_should_generate_a_warning
-      assert_match(/Both ActiveRecordTest::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)
+      assert_match(/Both ActiveRecordTest::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\./, @io.string)
     end
     
     def teardown
-      $stderr = @original_stderr
+      reset_rails_logger
       super
     end
   end
   
   class MachineWithDifferentIntegerColumnDefaultTest < BaseTestCase
     def setup
-      @original_stderr, $stderr = $stderr, StringIO.new
+      set_rails_logger(@io = StringIO.new)
       
       @model = new_model do
         connection.add_column table_name, :status, :integer, :default => 0
@@ -515,11 +515,11 @@ module ActiveRecordTest
     end
     
     def test_should_generate_a_warning
-      assert_match(/Both ActiveRecordTest::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)
+      assert_match(/Both ActiveRecordTest::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\./, @io.string)
     end
     
     def teardown
-      $stderr = @original_stderr
+      reset_rails_logger
       super
     end
   end
@@ -544,7 +544,7 @@ module ActiveRecordTest
   class MachineWithConflictingStateNameTest < BaseTestCase
     def setup
       require 'stringio'
-      @original_stderr, $stderr = $stderr, StringIO.new
+      set_rails_logger(@io = StringIO.new)
       
       @model = new_model
     end
@@ -553,18 +553,18 @@ module ActiveRecordTest
       @machine = EnumStateMachine::Machine.new(@model)
       @machine.state :state
       
-      assert_match(/^Instance method "state\?" is already defined in ActiveRecordTest::Foo, use generic helper instead.*\n$/, $stderr.string)
+      assert_match(/^Instance method "state\?" is already defined in ActiveRecordTest::Foo, use generic helper instead.*\n$/, @io.string)
     end
     
     def test_should_output_warning_with_same_machine_attribute
       @machine = EnumStateMachine::Machine.new(@model, :public_state, :attribute => :state)
       @machine.state :state
       
-      assert_match(/^Instance method "state\?" is already defined in ActiveRecordTest::Foo, use generic helper instead.*\n$/, $stderr.string)
+      assert_match(/^Instance method "state\?" is already defined in ActiveRecordTest::Foo, use generic helper instead.*\n$/, @io.string)
     end
     
     def teardown
-      $stderr = @original_stderr
+      reset_rails_logger
       super
     end
   end
@@ -702,7 +702,7 @@ module ActiveRecordTest
   class MachineWithCustomAttributeTest < BaseTestCase
     def setup
       require 'stringio'
-      @original_stderr, $stderr = $stderr, StringIO.new
+      set_rails_logger(@io = StringIO.new)
       
       @model = new_model
       @machine = EnumStateMachine::Machine.new(@model, :public_state, :attribute => :state)
@@ -714,7 +714,7 @@ module ActiveRecordTest
     end
     
     def teardown
-      $stderr = @original_stderr
+      reset_rails_logger
       super
     end
   end

data/test/unit/integrations/base_test.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 require 'rubygems'
 
 module BaseTest  
-  class IntegrationTest < MiniTest::Test
+  class IntegrationTest < Minitest::Test
     def test_should_have_an_integration_name
       assert_equal :base, EnumStateMachine::Integrations::Base.integration_name
     end
@@ -26,7 +26,7 @@ module BaseTest
     end
   end
   
-  class IncludedTest < MiniTest::Test
+  class IncludedTest < Minitest::Test
     def setup
       @integration = Module.new
       EnumStateMachine::Integrations.const_set('Custom', @integration)

data/test/unit/integrations_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class IntegrationMatcherTest < MiniTest::Test
+class IntegrationMatcherTest < Minitest::Test
   def setup
     superclass = Class.new
     self.class.const_set('Vehicle', superclass)
@@ -51,7 +51,7 @@ class IntegrationMatcherTest < MiniTest::Test
   end
 end
 
-class IntegrationFinderTest < MiniTest::Test
+class IntegrationFinderTest < Minitest::Test
   def test_should_find_base
     assert_equal EnumStateMachine::Integrations::Base, EnumStateMachine::Integrations.find_by_name(:base)
   end

data/test/unit/invalid_event_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class InvalidEventTest < MiniTest::Test
+class InvalidEventTest < Minitest::Test
   def setup
     @object = Object.new
     @invalid_event = EnumStateMachine::InvalidEvent.new(@object, :invalid)

data/test/unit/invalid_parallel_transition_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class InvalidParallelTransitionTest < MiniTest::Test
+class InvalidParallelTransitionTest < Minitest::Test
   def setup
     @object = Object.new
     @events = [:ignite, :disable_alarm]

data/test/unit/invalid_transition_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class InvalidTransitionTest < MiniTest::Test
+class InvalidTransitionTest < Minitest::Test
   def setup
     @klass = Class.new
     @machine = EnumStateMachine::Machine.new(@klass)
@@ -46,7 +46,7 @@ class InvalidTransitionTest < MiniTest::Test
   end
 end
 
-class InvalidTransitionWithNamespaceTest < MiniTest::Test
+class InvalidTransitionWithNamespaceTest < Minitest::Test
   def setup
     @klass = Class.new
     @machine = EnumStateMachine::Machine.new(@klass, :namespace => 'alarm')
@@ -76,7 +76,7 @@ class InvalidTransitionWithNamespaceTest < MiniTest::Test
   end
 end
 
-class InvalidTransitionWithIntegrationTest < MiniTest::Test
+class InvalidTransitionWithIntegrationTest < Minitest::Test
   def setup
     EnumStateMachine::Integrations.const_set('Custom', Module.new do
       include EnumStateMachine::Integrations::Base

data/test/unit/machine_collection_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class MachineCollectionByDefaultTest < MiniTest::Test
+class MachineCollectionByDefaultTest < Minitest::Test
   def setup
     @machines = EnumStateMachine::MachineCollection.new
   end
@@ -10,7 +10,7 @@ class MachineCollectionByDefaultTest < MiniTest::Test
   end
 end
 
-class MachineCollectionStateInitializationTest < MiniTest::Test
+class MachineCollectionStateInitializationTest < Minitest::Test
   def setup
     @machines = EnumStateMachine::MachineCollection.new
     
@@ -110,7 +110,7 @@ class MachineCollectionStateInitializationTest < MiniTest::Test
   end
 end
 
-class MachineCollectionFireTest < MiniTest::Test
+class MachineCollectionFireTest < Minitest::Test
   def setup
     @machines = EnumStateMachine::MachineCollection.new
     
@@ -193,7 +193,7 @@ class MachineCollectionFireTest < MiniTest::Test
   end
 end
 
-class MachineCollectionFireWithTransactionsTest < MiniTest::Test
+class MachineCollectionFireWithTransactionsTest < Minitest::Test
   def setup
     @machines = EnumStateMachine::MachineCollection.new
     
@@ -267,7 +267,7 @@ class MachineCollectionFireWithTransactionsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionFireWithValidationsTest < MiniTest::Test
+class MachineCollectionFireWithValidationsTest < Minitest::Test
   def setup
     EnumStateMachine::Integrations.const_set('Custom', Module.new do
       include EnumStateMachine::Integrations::Base
@@ -335,7 +335,7 @@ class MachineCollectionFireWithValidationsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithoutEventsTest < MiniTest::Test
+class MachineCollectionTransitionsWithoutEventsTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -359,7 +359,7 @@ class MachineCollectionTransitionsWithoutEventsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithBlankEventsTest < MiniTest::Test
+class MachineCollectionTransitionsWithBlankEventsTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -383,7 +383,7 @@ class MachineCollectionTransitionsWithBlankEventsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithInvalidEventsTest < MiniTest::Test
+class MachineCollectionTransitionsWithInvalidEventsTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -407,7 +407,7 @@ class MachineCollectionTransitionsWithInvalidEventsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithoutTransitionTest < MiniTest::Test
+class MachineCollectionTransitionsWithoutTransitionTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -432,7 +432,7 @@ class MachineCollectionTransitionsWithoutTransitionTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithTransitionTest < MiniTest::Test
+class MachineCollectionTransitionsWithTransitionTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -456,7 +456,7 @@ class MachineCollectionTransitionsWithTransitionTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithSameActionsTest < MiniTest::Test
+class MachineCollectionTransitionsWithSameActionsTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -485,7 +485,7 @@ class MachineCollectionTransitionsWithSameActionsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithDifferentActionsTest < MiniTest::Test
+class MachineCollectionTransitionsWithDifferentActionsTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -510,7 +510,7 @@ class MachineCollectionTransitionsWithDifferentActionsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithExisitingTransitionsTest < MiniTest::Test
+class MachineCollectionTransitionsWithExisitingTransitionsTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -534,7 +534,7 @@ class MachineCollectionTransitionsWithExisitingTransitionsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionTransitionsWithCustomOptionsTest < MiniTest::Test
+class MachineCollectionTransitionsWithCustomOptionsTest < Minitest::Test
   def setup
     @klass = Class.new
     
@@ -553,7 +553,7 @@ class MachineCollectionTransitionsWithCustomOptionsTest < MiniTest::Test
   end
 end
 
-class MachineCollectionFireAttributesWithValidationsTest < MiniTest::Test
+class MachineCollectionFireAttributesWithValidationsTest < Minitest::Test
   def setup
     @klass = Class.new do
       attr_accessor :errors