aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorMike Moore <mike@blowmage.com>2012-09-24 15:48:12 -0600
committerMike Moore <mike@blowmage.com>2012-09-24 15:49:40 -0600
commit64f254ccf74242453421d0c495388293dbc06c71 (patch)
treeea8ebf05a9719c699c2e34bc1ac1767a64d9d94f /actionpack/lib/action_dispatch
parentc0a24555f9e2749fb94efe1967cb9943db0b6a7e (diff)
downloadrails-64f254ccf74242453421d0c495388293dbc06c71.tar.gz
rails-64f254ccf74242453421d0c495388293dbc06c71.tar.bz2
rails-64f254ccf74242453421d0c495388293dbc06c71.zip
Register AD::IntegrationTest for minitest's spec DSL
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index a8b27ffafd..4bd7b69642 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -490,6 +490,9 @@ module ActionDispatch
include ActionController::TemplateAssertions
include ActionDispatch::Routing::UrlFor
+ # Use AD::IntegrationTest for acceptance tests
+ register_spec_type(/(Acceptance|Integration) ?Test\z/i, self)
+
@@app = nil
def self.app