Permalink
Browse files

Get all template tests passing on new base

  • Loading branch information...
1 parent a1f280e commit 7211048b2b1d640c4f33587b57261bdfe9c77b93 Carl Lerche committed May 26, 2009
View
@@ -64,8 +64,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
# ==== Not ported
# * filters
- # Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort +
- t.test_files = Dir.glob( "test/{dispatch}/**/*_test.rb" ).sort + %w(
+ t.test_files = Dir.glob( "test/{dispatch,template}/**/*_test.rb" ).sort + %w(
action_pack_assertions addresses_render assert_select
base benchmark caching capture content_type cookie dispatcher
filter_params flash helper http_basic_authentication
@@ -40,7 +40,7 @@ class Base < Http
module ImplicitRender
def process_action(method_name)
ret = super
- default_render if response_body.nil?
+ default_render unless performed?
ret
end
@@ -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 @@ def index
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

0 comments on commit 7211048

Please sign in to comment.