@@ -1,3 +1,4 @@ +- Fixed stack overflow caused by double include in Test::Unit adapter (reported by Dave Myron) - Fixed warnings (Patch by Bryan Helmkamp) 0.10.4 CHANGES @@ -326,6 +326,7 @@ to making it possible. We all are standing on the shoulders of giants. * Christopher Redinger for patches * Dan North for syntax ideas * Dave Astels for some BDD inspiration +* Dave Myron for a bug report * David Chelimsky for encouragement to make the RR framework, for developing the Rspec mock framework, syntax ideas, and patches * Daniel Sudol for identifing performance issues with RR * Felix Morio for pairing with me README.rdoc @@ -5,19 +5,21 @@ module RR def self.included(mod) RR.trim_backtrace = true mod.class_eval do - alias_method :setup_without_rr, :setup - def setup_with_rr - setup_without_rr - RR.reset - end - alias_method :setup, :setup_with_rr + unless instance_methods.include?('setup_with_rr') + alias_method :setup_without_rr, :setup + def setup_with_rr + setup_without_rr + RR.reset + end + alias_method :setup, :setup_with_rr - alias_method :teardown_without_rr, :teardown - def teardown_with_rr - RR.verify - teardown_without_rr + alias_method :teardown_without_rr, :teardown + def teardown_with_rr + RR.verify + teardown_without_rr + end + alias_method :teardown, :teardown_with_rr end - alias_method :teardown, :teardown_with_rr end end lib/rr/adapters/test_unit.rb @@ -1,6 +1,8 @@ require File.expand_path("#{File.dirname(__FILE__)}/test_helper") class TestUnitIntegrationTest < Test::Unit::TestCase + include RR::Adapters::TestUnit # Testing against double inclusion issues + def setup super @subject = Object.new spec/rr/test_unit/test_unit_integration_test.rb 0e133e7c35dcbc1058827c2b93cd1f71ba2658e2 Brian Takita brian@honk.com http://github.com/btakita/rr/commit/fb245c69d80669fb3e0fcf420ccf55082b74b87e fb245c69d80669fb3e0fcf420ccf55082b74b87e 2009-10-18T22:37:53-07:00 2009-10-18T22:37:53-07:00 - Fixed stack overflow caused by double include in Test::Unit adapter (reported by Dave Myron) 6e7a46f38358f761803584a93e047063ba0aeff2 Brian Takita brian@honk.com