diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-28 14:06:10 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-31 13:57:23 -0300 |
| commit | d58d71f565848cccc1a3fa4ae504559042146c42 (patch) | |
| tree | 41db2f0d78f23844ba70c887092e88c2b1babc69 /activesupport/lib/active_support/test_case.rb | |
| parent | 5e5107430bccc0a536e0b264c951793d8fe62235 (diff) | |
| download | rails-d58d71f565848cccc1a3fa4ae504559042146c42.tar.gz rails-d58d71f565848cccc1a3fa4ae504559042146c42.tar.bz2 rails-d58d71f565848cccc1a3fa4ae504559042146c42.zip | |
Revert "minitest provides "it" and "describe""
This reverts commit 22bc12ec374b8bdeb3818ca0a3eb787dd3ce39d8.
REASON: We will remove the MiniTest::Spec from Rails and we need these
methods again
Conflicts:
activesupport/lib/active_support/test_case.rb
Diffstat (limited to 'activesupport/lib/active_support/test_case.rb')
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index e4f182a3aa..be1bdbb52f 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -5,6 +5,7 @@ require 'active_support/testing/setup_and_teardown' require 'active_support/testing/assertions' require 'active_support/testing/deprecation' require 'active_support/testing/pending' +require 'active_support/testing/declarative' require 'active_support/testing/isolation' require 'active_support/testing/constant_lookup' require 'active_support/core_ext/kernel/reporting' @@ -42,25 +43,7 @@ module ActiveSupport include ActiveSupport::Testing::Assertions include ActiveSupport::Testing::Deprecation include ActiveSupport::Testing::Pending - - def self.describe(text) - if block_given? - super - else - message = "`describe` without a block is deprecated, please switch to: `def self.name; #{text.inspect}; end`\n" - ActiveSupport::Deprecation.warn message - - class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1 - def self.name - "#{text}" - end - RUBY_EVAL - end - end - - class << self - alias :test :it - end + extend ActiveSupport::Testing::Declarative # test/unit backwards compatibility methods alias :assert_raise :assert_raises |