aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/integration.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-17 17:52:16 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-03-17 17:52:21 -0700
commit0e15f07b75d04ddc349a93ad7fdfcbc502ef535d (patch)
treea5306d145d4972eab6858fba4d9a7a4ba5c742f4 /actionpack/lib/action_dispatch/testing/integration.rb
parent6c0c0f41a3bad10c3c1acaf3124746f891f9ccbf (diff)
downloadrails-0e15f07b75d04ddc349a93ad7fdfcbc502ef535d.tar.gz
rails-0e15f07b75d04ddc349a93ad7fdfcbc502ef535d.tar.bz2
rails-0e15f07b75d04ddc349a93ad7fdfcbc502ef535d.zip
Get modules back into integration tests
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
-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 305c2bfc32..4ed62a6ac4 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -288,6 +288,8 @@ module ActionDispatch
end
module Runner
+ include ActionDispatch::Assertions
+
def app
@app
end
@@ -455,6 +457,7 @@ module ActionDispatch
# end
class IntegrationTest < ActiveSupport::TestCase
include Integration::Runner
+ include ActionController::TemplateAssertions
@@app = nil