aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-05-26 15:19:39 -0700
committerCarl Lerche <carllerche@mac.com>2009-05-26 15:19:39 -0700
commit7211048b2b1d640c4f33587b57261bdfe9c77b93 (patch)
tree4b0cfb4959eeb50280793e4f6354a3bda2cae6b9 /actionpack/test/template
parenta1f280e83d2b134e23897d4de457d76fb0095768 (diff)
downloadrails-7211048b2b1d640c4f33587b57261bdfe9c77b93.tar.gz
rails-7211048b2b1d640c4f33587b57261bdfe9c77b93.tar.bz2
rails-7211048b2b1d640c4f33587b57261bdfe9c77b93.zip
Get all template tests passing on new base
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/body_parts_test.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb
index e17092a452..4e7aa63f96 100644
--- a/actionpack/test/template/body_parts_test.rb
+++ b/actionpack/test/template/body_parts_test.rb
@@ -4,6 +4,9 @@ class BodyPartsTest < ActionController::TestCase
RENDERINGS = [Object.new, Object.new, Object.new]
class TestController < ActionController::Base
+ def performed?
+ defined?(ActionController::Http) ? true : super
+ end
def index
RENDERINGS.each do |rendering|
@template.punctuate_body! rendering
@@ -16,7 +19,7 @@ class BodyPartsTest < ActionController::TestCase
def test_body_parts
get :index
- pending do
+ pending(:old_base) do
# TestProcess buffers body_parts into body
# TODO: Rewrite test w/o going through process
assert_equal RENDERINGS, @response.body_parts