aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-12-04 23:13:04 -0200
committerŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2013-12-05 11:39:56 +0100
commitd6eda3ef3c59e377670442cd7f36460dbdf389f5 (patch)
tree26b695071c8f5a8f4ae843f5e20ae947297589c8 /actionpack
parente064658d64f7fb071ec35764f2d5203e8b58e044 (diff)
downloadrails-d6eda3ef3c59e377670442cd7f36460dbdf389f5.tar.gz
rails-d6eda3ef3c59e377670442cd7f36460dbdf389f5.tar.bz2
rails-d6eda3ef3c59e377670442cd7f36460dbdf389f5.zip
Remove missing integration points of AV extraction
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/abstract_unit.rb2
-rw-r--r--actionpack/test/controller/render_test.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index a0d90f7eee..0e163a93eb 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -246,8 +246,6 @@ class Rack::TestCase < ActionDispatch::IntegrationTest
end
end
-ActionController::Base.superclass.send(:include, ActionView::Layouts)
-
module ActionController
class Base
include ActionController::Testing
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index f41287381a..26806fb03f 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -529,4 +529,4 @@ class HeadRenderTest < ActionController::TestCase
assert_equal "something", @response.headers["X-Custom-Header"]
assert_response :forbidden
end
-end \ No newline at end of file
+end