From da290fae09086f864e59ba43b4a0c4f3d8661da1 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Sun, 11 May 2014 15:41:23 -0700 Subject: Remove unnecessary include for integration tests. --- actionpack/lib/action_dispatch/testing/integration.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'actionpack/lib/action_dispatch/testing') diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index cc6b763093..789aa608a4 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -270,12 +270,6 @@ module ActionDispatch path = location.query ? "#{location.path}?#{location.query}" : location.path end - unless ActionController::Base < ActionController::Testing - ActionController::Base.class_eval do - include ActionController::Testing - end - end - hostname, port = host.split(':') env = { -- cgit v1.2.3