aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing
diff options
context:
space:
mode:
authorYehuda Katz and Carl Lerche <wycats@gmail.com>2009-04-07 15:54:02 -0700
committerYehuda Katz and Carl Lerche <wycats@gmail.com>2009-04-07 15:54:02 -0700
commit95c9718118bc0342ddb320f23b5e0a17fb12b7ad (patch)
tree131f46b4a147a492def006c6190c58a7e0abd057 /activesupport/lib/active_support/testing
parentc1aa5b0e14cd4bd27a5d8bd85cf7c36fa5911830 (diff)
downloadrails-95c9718118bc0342ddb320f23b5e0a17fb12b7ad.tar.gz
rails-95c9718118bc0342ddb320f23b5e0a17fb12b7ad.tar.bz2
rails-95c9718118bc0342ddb320f23b5e0a17fb12b7ad.zip
Layouts work in AbstractController. Add support for the rspec runner for T::U
Diffstat (limited to 'activesupport/lib/active_support/testing')
-rw-r--r--activesupport/lib/active_support/testing/declarative.rb49
-rw-r--r--activesupport/lib/active_support/testing/pending.rb45
2 files changed, 61 insertions, 33 deletions
diff --git a/activesupport/lib/active_support/testing/declarative.rb b/activesupport/lib/active_support/testing/declarative.rb
index cb6a5844eb..a7af7f4224 100644
--- a/activesupport/lib/active_support/testing/declarative.rb
+++ b/activesupport/lib/active_support/testing/declarative.rb
@@ -1,18 +1,43 @@
module ActiveSupport
module Testing
module Declarative
- # 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}"
+
+ def self.extended(klass)
+ klass.class_eval do
+
+ unless method_defined?(:describe)
+ def self.describe(text)
+ class_eval <<-RUBY_EVAL
+ def self.name
+ "#{text}"
+ end
+ RUBY_EVAL
+ end
+ end
+
+ if defined?(Spec)
+ class << self
+ alias_method :test, :it
+ 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
diff --git a/activesupport/lib/active_support/testing/pending.rb b/activesupport/lib/active_support/testing/pending.rb
index 9b2ab73dd0..b6905ddccd 100644
--- a/activesupport/lib/active_support/testing/pending.rb
+++ b/activesupport/lib/active_support/testing/pending.rb
@@ -5,31 +5,34 @@ module ActiveSupport
module Testing
module Pending
- @@pending_cases = []
- @@at_exit = false
+ unless defined?(Spec)
- def pending(description = "", &block)
- if block_given?
- failed = false
+ @@pending_cases = []
+ @@at_exit = false
- begin
- block.call
- rescue
- failed = true
- end
+ def pending(description = "", &block)
+ if block_given?
+ failed = false
- flunk("<#{description}> did not fail.") unless failed
- end
+ begin
+ block.call
+ rescue
+ failed = true
+ end
- caller[0] =~ (/(.*):(.*):in `(.*)'/)
- @@pending_cases << "#{$3} at #{$1}, line #{$2}"
- print "P"
-
- @@at_exit ||= begin
- at_exit do
- puts "\nPending Cases:"
- @@pending_cases.each do |test_case|
- puts test_case
+ flunk("<#{description}> did not fail.") unless failed
+ end
+
+ caller[0] =~ (/(.*):(.*):in `(.*)'/)
+ @@pending_cases << "#{$3} at #{$1}, line #{$2}"
+ print "P"
+
+ @@at_exit ||= begin
+ at_exit do
+ puts "\nPending Cases:"
+ @@pending_cases.each do |test_case|
+ puts test_case
+ end
end
end
end