activemodel/lib/active_model/state_machine.rb activemodel/lib/active_model/state_machine/machine.rb activemodel/lib/active_model/state_machine/state.rb activemodel/test/state_machine/machine_test.rb activemodel/test/state_machine/state_test.rb activemodel/test/state_machine_test.rb @@ -1,4 +1,4 @@ -require 'active_model/observing' +require 'active_model/core' module ActiveModel module Callbacks activemodel/lib/active_model/callbacks.rb @@ -1,4 +1,4 @@ -require 'active_model/observing' +require 'active_model/core' module ActiveModel module Validations activemodel/lib/active_model/validations.rb @@ -1,4 +1,4 @@ -require File.join(File.dirname(__FILE__), 'test_helper') +require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper')) class ObservedModel < ActiveModel::Base class Observer @@ -20,7 +20,7 @@ end class Foo < ActiveModel::Base end -class ObservingTest < ActiveSupport::TestCase +class ObservingTest < ActiveModel::TestCase def setup ObservedModel.observers.clear end @@ -67,7 +67,7 @@ class ObservingTest < ActiveSupport::TestCase end end -class ObserverTest < ActiveSupport::TestCase +class ObserverTest < ActiveModel::TestCase def setup ObservedModel.observers = :foo_observer FooObserver.models = nil activemodel/test/observing_test.rb @@ -3,7 +3,8 @@ $:.unshift File.dirname(__FILE__) require 'test/unit' require 'active_model' -require 'active_support/callbacks' # needed by ActiveSupport::TestCase +require 'active_model/state_machine' +require 'active_support/callbacks' # needed by ActiveModel::TestCase require 'active_support/test_case' def uses_gem(gem_name, test_name, version = '> 0') @@ -21,3 +22,18 @@ unless defined? uses_mocha uses_gem('mocha', test_name, '>= 0.5.5', &block) end end + +begin + require 'rubygems' + require 'ruby-debug' + Debugger.start +rescue LoadError +end + +ActiveSupport::TestCase.send :include, ActiveSupport::Testing::Default + +module ActiveModel + class TestCase < ActiveSupport::TestCase + include ActiveSupport::Testing::Default + end +end \ No newline at end of file activemodel/test/test_helper.rb b7c6ceff9a31cc478c4bc89d57980900a775fbed rick technoweenie technoweenie@gmail.com http://github.com/rails/rails/commit/b9528ad3c5379896b00772cb44faf1db0fd882d7 b9528ad3c5379896b00772cb44faf1db0fd882d7 2008-06-28T00:55:02-07:00 2008-06-28T00:55:02-07:00 initial statemachine machine and state classes 422ae423e519f744d51698d45a6fb931172b9cb2 rick technoweenie technoweenie@gmail.com