From cf865196fec17d337640b4bca5cb16ca7c67f62f Mon Sep 17 00:00:00 2001
From: Rick Olson <technoweenie@gmail.com>
Date: Sun, 1 Apr 2007 22:29:19 +0000
Subject: add ActionView::Base#find_template_extension_for tests

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6498 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/test/abstract_unit.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'actionpack/test/abstract_unit.rb')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index bc7c80f1ce..2733ed95da 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -18,8 +18,10 @@ ActionController::Routing::Routes.reload rescue nil
 
 # Wrap tests that use Mocha and skip if unavailable.
 def uses_mocha(test_name)
-  require 'mocha'
-  require 'stubba'
+  unless Object.const_defined?(:Mocha)
+    require 'mocha'
+    require 'stubba'
+  end
   yield
 rescue LoadError
   $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
-- 
cgit v1.2.3