Skip to content
Browse files

remove the runner method copied from minitest

  • Loading branch information...
1 parent 089da2e commit ada571bfcdbad669ae43a4dd18277ef227680a0b @tenderlove tenderlove committed Jul 3, 2012
Showing with 7 additions and 20 deletions.
  1. +7 −20 activesupport/lib/active_support/testing/setup_and_teardown.rb
View
27 activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -30,28 +30,15 @@ def teardown(*args, &block)
end
end
- def run(runner)
- result = '.'
- begin
- run_callbacks :setup do
- result = super
- end
- rescue *PASSTHROUGH_EXCEPTIONS
- raise
- rescue Exception => e
- result = runner.puke(self.class, method_name, e)
- ensure
- begin
- run_callbacks :teardown
- rescue *PASSTHROUGH_EXCEPTIONS
@carlosantoniodasilva
Ruby on Rails member

can we kill this constant now? 😄

@tenderlove
Ruby on Rails member
tenderlove added a note Jul 4, 2012

Do it!

@carlosantoniodasilva
Ruby on Rails member

Done! f335389

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
- raise
- rescue Exception => e
- result = runner.puke(self.class, method_name, e)
- end
- end
- result
+ def before_setup
+ super
+ run_callbacks :setup
end
+ def after_teardown
+ run_callbacks :teardown
+ super
+ end
end
end
end

3 comments on commit ada571b

@rubys
rubys commented on ada571b Jul 4, 2012

This change causes all test setup to be bypassed. Example (scroll to the bottom):

http://intertwingly.net/projects/AWDwR4/checkdepot-40/section-6.1.html

Git bisect output:

ada571bfcdbad669ae43a4dd18277ef227680a0b is the first bad commit
commit ada571bfcdbad669ae43a4dd18277ef227680a0b
Author: Aaron Patterson 
Date:   Tue Jul 3 14:23:42 2012 -0700

    remove the runner method copied from minitest

:040000 040000 03e171879f3b27398c3fd29d70d7cb864d3fab32 caf001acb9ff2705f3d3621ae1bfcffb7428960f M  activesupport
bisect run success
@tenderlove
Ruby on Rails member
@tenderlove
Ruby on Rails member

@rubys this should be fixed in 6f74d36 (I think). If not, please let me know!

Please sign in to comment.
Something went wrong with that request. Please try again.