Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Merge pull request #4575 from carlosantoniodasilva/remove-tes…

…t-pending"

This reverts commit 1620df7, reversing
changes made to 2d00032.

Conflicts:
	activesupport/CHANGELOG.md
	activesupport/lib/active_support/test_case.rb
  • Loading branch information...
commit 4913984122c436a74179e6d0aa4b5ec0ca2ebe59 1 parent a739340
Carlos Antonio da Silva carlosantoniodasilva authored
2  activesupport/CHANGELOG.md
View
@@ -270,8 +270,6 @@
* Add html_escape_once to ERB::Util, and delegate escape_once tag helper to it. *Carlos Antonio da Silva*
-* 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*
2  activesupport/lib/active_support/test_case.rb
View
@@ -4,6 +4,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/isolation'
require 'active_support/testing/constant_lookup'
require 'active_support/core_ext/kernel/reporting'
@@ -40,6 +41,7 @@ def self.test_order # :nodoc:
include ActiveSupport::Testing::SetupAndTeardown
include ActiveSupport::Testing::Assertions
include ActiveSupport::Testing::Deprecation
+ include ActiveSupport::Testing::Pending
def self.describe(text)
if block_given?
20 activesupport/lib/active_support/testing/pending.rb
View
@@ -0,0 +1,20 @@
+# Some code from jeremymcanally's "pending"
+# https://github.com/jeremymcanally/pending/tree/master
+
+module ActiveSupport
+ module Testing
+ module Pending
+
+ unless defined?(Spec)
+
+ @@pending_cases = []
+ @@at_exit = false
+
+ def pending(description = "", &block)
+ skip(description.blank? ? nil : description)
+ end
+ end
+
+ end
+ end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.