Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Wrap and skip tests using mocha.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5926 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit a6e12c0c21159503cef99fa69be7a708a2d39ed9 1 parent 6714b39
@jeremy jeremy authored
View
10 actionpack/test/abstract_unit.rb
@@ -14,3 +14,13 @@
ActionController::Base.logger = nil
ActionController::Base.ignore_missing_templates = false
ActionController::Routing::Routes.reload rescue nil
+
+
+# Wrap tests that use Mocha and skip if unavailable.
+def uses_mocha(test_name)
+ require 'mocha'
+ require 'stubba'
+ yield
+rescue LoadError
+ $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
+end
View
8 actionpack/test/controller/integration_test.rb
@@ -3,9 +3,7 @@
$:.unshift File.dirname(__FILE__) + '/../../../railties/lib'
require 'action_controller/integration'
-begin # rescue LoadError
-require 'mocha'
-require 'stubba'
+uses_mocha 'integration' do
# Stub process for testing.
module ActionController
@@ -149,6 +147,4 @@ def test_xml_http_request
# class MockCGITest < Test::Unit::TestCase
# end
-rescue LoadError
- $stderr.puts "Skipping integration tests. `gem install mocha` and try again."
-end
+end # uses_mocha
View
5 actionpack/test/controller/rescue_test.rb
@@ -1,7 +1,6 @@
require File.dirname(__FILE__) + '/../abstract_unit'
-# gem install mocha
-require 'mocha'
+uses_mocha 'rescue' do
class RescueController < ActionController::Base
def raises
@@ -210,3 +209,5 @@ def with_rails_root(path = nil)
end
end
end
+
+end # uses_mocha
Please sign in to comment.
Something went wrong with that request. Please try again.