From 0e15f07b75d04ddc349a93ad7fdfcbc502ef535d Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 17 Mar 2010 17:52:16 -0700
Subject: [PATCH] Get modules back into integration tests

---
 actionpack/lib/action_controller/test_case.rb         | 1 -
 actionpack/lib/action_dispatch/testing/integration.rb | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 8ab0c32a9e..120f34460e 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -1,5 +1,4 @@
 require 'rack/session/abstract/id'
-require 'action_view/test_case'
 
 module ActionController
   module TemplateAssertions
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