diff options
| author | Cristian Bica <cristian.bica@gmail.com> | 2014-08-13 22:55:32 +0300 |
|---|---|---|
| committer | Cristian Bica <cristian.bica@gmail.com> | 2014-08-13 22:55:32 +0300 |
| commit | 06908e60be2bd3e2f247e26d3d1fa6bcb7f43943 (patch) | |
| tree | 2f1752c774fad931e62669ee96d26b5b7da0bd61 /activesupport/lib | |
| parent | 95b79c1ff4d253d1554615baa5a02b0910d5a6dc (diff) | |
| parent | 2750cc41484266c731c4bf0460d74b0de49e7450 (diff) | |
| download | rails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.tar.gz rails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.tar.bz2 rails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.zip | |
Merge branch 'master' into activejob
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index a6a878140c..0df599b692 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -15,16 +15,11 @@ module ActiveSupport class TestCase < ::Minitest::Test Assertion = Minitest::Assertion - alias_method :method_name, :name - - $tags = {} - def self.for_tag(tag) - yield if $tags[tag] + class << self + alias :my_tests_are_order_dependent! :i_suck_and_my_tests_are_order_dependent! end - # FIXME: we have tests that depend on run order, we should fix that and - # remove this method call. - self.i_suck_and_my_tests_are_order_dependent! + alias_method :method_name, :name include ActiveSupport::Testing::TaggedLogging include ActiveSupport::Testing::SetupAndTeardown |