Skip to content
Browse files

Remove active_support/testing/pending.rb was deprecated.

  • Loading branch information...
1 parent f8f30c8 commit 6c2cbc6fff719fcd2a191c621ab41ed7ac917e67 @kennyj kennyj committed
View
2 activesupport/lib/active_support/test_case.rb
@@ -4,7 +4,6 @@
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 @@ def self.test_order # :nodoc:
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
View
14 activesupport/lib/active_support/testing/pending.rb
@@ -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
View
11 activesupport/test/test_case_test.rb
@@ -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

0 comments on commit 6c2cbc6

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