mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove ActiveSupport::TestCase#pending, use skip
instead
This commit is contained in:
parent
c05f3b0e4f
commit
c8504b1b56
3 changed files with 2 additions and 22 deletions
|
@ -1,5 +1,7 @@
|
||||||
## Rails 4.0.0 (unreleased) ##
|
## 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,
|
* Deprecates the compatibility method Module#local_constant_names,
|
||||||
use Module#local_constants instead (which returns symbols). *fxn*
|
use Module#local_constants instead (which returns symbols). *fxn*
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ require 'active_support/testing/setup_and_teardown'
|
||||||
require 'active_support/testing/assertions'
|
require 'active_support/testing/assertions'
|
||||||
require 'active_support/testing/deprecation'
|
require 'active_support/testing/deprecation'
|
||||||
require 'active_support/testing/declarative'
|
require 'active_support/testing/declarative'
|
||||||
require 'active_support/testing/pending'
|
|
||||||
require 'active_support/testing/isolation'
|
require 'active_support/testing/isolation'
|
||||||
require 'active_support/testing/mochaing'
|
require 'active_support/testing/mochaing'
|
||||||
require 'active_support/core_ext/kernel/reporting'
|
require 'active_support/core_ext/kernel/reporting'
|
||||||
|
@ -40,7 +39,6 @@ module ActiveSupport
|
||||||
include ActiveSupport::Testing::SetupAndTeardown
|
include ActiveSupport::Testing::SetupAndTeardown
|
||||||
include ActiveSupport::Testing::Assertions
|
include ActiveSupport::Testing::Assertions
|
||||||
include ActiveSupport::Testing::Deprecation
|
include ActiveSupport::Testing::Deprecation
|
||||||
include ActiveSupport::Testing::Pending
|
|
||||||
extend ActiveSupport::Testing::Declarative
|
extend ActiveSupport::Testing::Declarative
|
||||||
|
|
||||||
# test/unit backwards compatibility methods
|
# test/unit backwards compatibility methods
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
# 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
|
|
Loading…
Reference in a new issue