diff options
| author | kennyj <kennyj@gmail.com> | 2013-06-01 13:16:32 +0900 |
|---|---|---|
| committer | kennyj <kennyj@gmail.com> | 2013-06-01 21:23:19 +0900 |
| commit | 6c2cbc6fff719fcd2a191c621ab41ed7ac917e67 (patch) | |
| tree | f4621ddfca4e79680fe7e841491f425412567ec0 | |
| parent | f8f30c88ad6190589e34f18813031f6c260e71dd (diff) | |
| download | rails-6c2cbc6fff719fcd2a191c621ab41ed7ac917e67.tar.gz rails-6c2cbc6fff719fcd2a191c621ab41ed7ac917e67.tar.bz2 rails-6c2cbc6fff719fcd2a191c621ab41ed7ac917e67.zip | |
Remove active_support/testing/pending.rb was deprecated.
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/pending.rb | 14 | ||||
| -rw-r--r-- | activesupport/test/test_case_test.rb | 11 |
3 files changed, 0 insertions, 27 deletions
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index b124ae184d..2f27aff2bd 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -4,7 +4,6 @@ require 'active_support/testing/tagged_logging' 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' @@ -54,7 +53,6 @@ module ActiveSupport include ActiveSupport::Testing::SetupAndTeardown include ActiveSupport::Testing::Assertions include ActiveSupport::Testing::Deprecation - include ActiveSupport::Testing::Pending extend ActiveSupport::Testing::Declarative # test/unit backwards compatibility methods diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb deleted file mode 100644 index b04bbbbaea..0000000000 --- a/activesupport/lib/active_support/testing/pending.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'active_support/deprecation' - -module ActiveSupport - module Testing - module Pending # :nodoc: - unless defined?(Spec) - def pending(description = "", &block) - ActiveSupport::Deprecation.warn("#pending is deprecated and will be removed in Rails 4.1, please use #skip instead.") - skip(description.blank? ? nil : description) - end - end - end - end -end diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb deleted file mode 100644 index 08df67827e..0000000000 --- a/activesupport/test/test_case_test.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'abstract_unit' - -module ActiveSupport - class TestCaseTest < ActiveSupport::TestCase - def test_pending_deprecation - assert_deprecated do - pending "should use #skip instead" - end - end - end -end |