diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 16:51:51 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 16:51:51 -0700 |
commit | 65102c8f1a55c8d73e44b62eed5e689017ace7cd (patch) | |
tree | 27714a7b1c13c1a347dd827ed4cf0abc53f0fcaa /actionpack/test/template | |
parent | 55ee0ba7f5b6b5d2023eb5dcc030946ed589fe53 (diff) | |
download | rails-65102c8f1a55c8d73e44b62eed5e689017ace7cd.tar.gz rails-65102c8f1a55c8d73e44b62eed5e689017ace7cd.tar.bz2 rails-65102c8f1a55c8d73e44b62eed5e689017ace7cd.zip |
Cleaning up more tests and code that needed to work in both old and new base
Diffstat (limited to 'actionpack/test/template')
-rw-r--r-- | actionpack/test/template/body_parts_test.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/actionpack/test/template/body_parts_test.rb b/actionpack/test/template/body_parts_test.rb index 4e7aa63f96..bac67c1a7d 100644 --- a/actionpack/test/template/body_parts_test.rb +++ b/actionpack/test/template/body_parts_test.rb @@ -4,9 +4,8 @@ class BodyPartsTest < ActionController::TestCase RENDERINGS = [Object.new, Object.new, Object.new] class TestController < ActionController::Base - def performed? - defined?(ActionController::Http) ? true : super - end + def performed?() true end + def index RENDERINGS.each do |rendering| @template.punctuate_body! rendering @@ -19,11 +18,9 @@ class BodyPartsTest < ActionController::TestCase def test_body_parts get :index - pending(:old_base) do - # TestProcess buffers body_parts into body - # TODO: Rewrite test w/o going through process - assert_equal RENDERINGS, @response.body_parts - end + # TestProcess buffers body_parts into body + # TODO: Rewrite test w/o going through process + assert_equal RENDERINGS, @response.body_parts assert_equal RENDERINGS.join, @response.body end end |