Remove ActiveSupport::TestCase#pending, use skip instead

rails · Jan 21, 2012 · c8504b1 · c8504b1
1 parent c05f3b0
commit c8504b1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*    Remove ActiveSupport::TestCase#pending method, use `skip` instead. *Carlos Antonio da Silva*
+
 *    Deprecates the compatibility method Module#local_constant_names,
      use Module#local_constants instead (which returns symbols). *fxn*
 

diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
@@ -3,7 +3,6 @@
 require 'active_support/testing/assertions'
 require 'active_support/testing/deprecation'
 require 'active_support/testing/declarative'
-require 'active_support/testing/pending'
 require 'active_support/testing/isolation'
 require 'active_support/testing/mochaing'
 require 'active_support/core_ext/kernel/reporting'
@@ -40,7 +39,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

diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb