mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
minitest provides "it" and "describe"
Remove rails implementation of describe, alias "test" to "it"
This commit is contained in:
parent
3270156049
commit
22bc12ec37
2 changed files with 4 additions and 42 deletions
|
@ -3,7 +3,6 @@ require 'minitest/spec'
|
||||||
require 'active_support/testing/setup_and_teardown'
|
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/isolation'
|
require 'active_support/testing/isolation'
|
||||||
require 'active_support/testing/mocha_module'
|
require 'active_support/testing/mocha_module'
|
||||||
require 'active_support/core_ext/kernel/reporting'
|
require 'active_support/core_ext/kernel/reporting'
|
||||||
|
@ -35,7 +34,10 @@ 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
|
||||||
extend ActiveSupport::Testing::Declarative
|
|
||||||
|
class << self
|
||||||
|
alias :test :it
|
||||||
|
end
|
||||||
|
|
||||||
# test/unit backwards compatibility methods
|
# test/unit backwards compatibility methods
|
||||||
alias :assert_raise :assert_raises
|
alias :assert_raise :assert_raises
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
module ActiveSupport
|
|
||||||
module Testing
|
|
||||||
module Declarative
|
|
||||||
|
|
||||||
def self.extended(klass) #:nodoc:
|
|
||||||
klass.class_eval do
|
|
||||||
|
|
||||||
unless method_defined?(:describe)
|
|
||||||
def self.describe(text)
|
|
||||||
class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
|
|
||||||
def self.name
|
|
||||||
"#{text}"
|
|
||||||
end
|
|
||||||
RUBY_EVAL
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
unless defined?(Spec)
|
|
||||||
# test "verify something" do
|
|
||||||
# ...
|
|
||||||
# end
|
|
||||||
def test(name, &block)
|
|
||||||
test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
|
|
||||||
defined = instance_method(test_name) rescue false
|
|
||||||
raise "#{test_name} is already defined in #{self}" if defined
|
|
||||||
if block_given?
|
|
||||||
define_method(test_name, &block)
|
|
||||||
else
|
|
||||||
define_method(test_name) do
|
|
||||||
flunk "No implementation provided for #{name}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
Loading…
Reference in a new issue