lib/spec/rails/interop/testcase.rb spec/rails/interop/testcase_spec.rb @@ -12,3 +12,4 @@ require 'spec/rails/matchers' require 'spec/rails/mocks' require 'spec/rails/example' require 'spec/rails/extensions' +require 'spec/rails/interop/testcase' \ No newline at end of file lib/spec/rails.rb @@ -11,11 +11,15 @@ module Spec class RailsExampleGroup < Test::Unit::TestCase # Rails >= r8570 uses setup/teardown_fixtures explicitly - before(:each) do - setup_fixtures if self.respond_to?(:setup_fixtures) - end - after(:each) do - teardown_fixtures if self.respond_to?(:teardown_fixtures) + # However, Rails >= r8664 extracted these out to use ActiveSupport::Callbacks. + # The latter case is handled at the TestCase level, in interop/testcase.rb + unless ActiveSupport.const_defined?(:Callbacks) and self.include?(ActiveSupport::Callbacks) + before(:each) do + setup_fixtures if self.respond_to?(:setup_fixtures) + end + after(:each) do + teardown_fixtures if self.respond_to?(:teardown_fixtures) + end end include Spec::Rails::Matchers lib/spec/rails/example/rails_example_group.rb 557a2cef32895bd4b3ca5c5da0d41dba0f02c849 Jonathan del Strother jon.delStrother@bestbefore.tv http://github.com/dchelimsky/rspec-rails/commit/5d62ea0ed9a4f7c5cba81048ef2af998a5348148 5d62ea0ed9a4f7c5cba81048ef2af998a5348148 2008-07-17T16:50:00-07:00 2008-07-11T15:48:27-07:00 Call Rail's TestCase setup/teardown callbacks Rails r8664 introducted ActiveSupport::Callbacks into TestCase, used for loading fixtures, among other things. Ensure they're called when rspec runs vanilla TestCase tests. Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> 49b2bf243924573d62f59a692c302cb160751ca0 David Chelimsky david@chelimac.local