diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-10-26 23:24:10 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-10-26 23:24:10 +0000 |
| commit | 56fec2f26906f996c3eb40d55fd74276928e478b (patch) | |
| tree | e5ab66cc18871bf7a4dbe39bacb217f6ad850942 | |
| parent | 2a74d71e49604e21e03a002d38f0c68d0be81574 (diff) | |
| download | rails-56fec2f26906f996c3eb40d55fd74276928e478b.tar.gz rails-56fec2f26906f996c3eb40d55fd74276928e478b.tar.bz2 rails-56fec2f26906f996c3eb40d55fd74276928e478b.zip | |
Make Default Test work with both ruby 1.8.4 and 1.8.6. [DrMark] Closes #10003
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8040 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activesupport/lib/active_support/testing/default.rb | 3 | ||||
| -rw-r--r-- | activesupport/test/test_test.rb | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/default.rb b/activesupport/lib/active_support/testing/default.rb index 0cb0eea7d2..d97a610c79 100644 --- a/activesupport/lib/active_support/testing/default.rb +++ b/activesupport/lib/active_support/testing/default.rb @@ -2,7 +2,8 @@ module ActiveSupport module Testing module Default def run(*args) - return if method_name == :default_test + #method_name appears to be a symbol on 1.8.4 and a string on 1.8.6 + return if @method_name.to_s == "default_test" super end end diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb index 5c8039ea1e..a05fb9b92d 100644 --- a/activesupport/test/test_test.rb +++ b/activesupport/test/test_test.rb @@ -63,3 +63,9 @@ class AssertDifferenceTest < Test::Unit::TestCase def default_test; end end end + +# This should always pass + +class NotTestingThingsTest < Test::Unit::TestCase + include ActiveSupport::Testing::Default +end |