Layouts work in AbstractController. Add support for the rspec runner for T::U

1 files changed, 24 insertions, 21 deletions

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