aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-01-14 12:49:55 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-01-14 12:49:55 +0000
commita6e12c0c21159503cef99fa69be7a708a2d39ed9 (patch)
tree5071f4ea68b8d078580c55e8e9824f3a9bb840d0 /actionpack/test/controller
parent6714b39a133bb8da1b4f6f485f35494ff8ad87ab (diff)
downloadrails-a6e12c0c21159503cef99fa69be7a708a2d39ed9.tar.gz
rails-a6e12c0c21159503cef99fa69be7a708a2d39ed9.tar.bz2
rails-a6e12c0c21159503cef99fa69be7a708a2d39ed9.zip
Wrap and skip tests using mocha.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5926 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/integration_test.rb8
-rw-r--r--actionpack/test/controller/rescue_test.rb5
2 files changed, 5 insertions, 8 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 665c5901e5..a26b6eb259 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -3,9 +3,7 @@ require File.dirname(__FILE__) + '/../abstract_unit'
$:.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 @@ end
# class MockCGITest < Test::Unit::TestCase
# end
-rescue LoadError
- $stderr.puts "Skipping integration tests. `gem install mocha` and try again."
-end
+end # uses_mocha
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index c7e055a859..aa4d851e8e 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/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 @@ class RescueTest < Test::Unit::TestCase
end
end
end
+
+end # uses_mocha