aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/render_test.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-05-30 09:00:46 +0000
committerJamis Buck <jamis@37signals.com>2005-05-30 09:00:46 +0000
commitf8542a64b30bb6f67bcedf0c82de1291aab3c3d9 (patch)
tree375ae117198ca6f03526a0cbfcfc9f1729bf6027 /actionpack/test/controller/render_test.rb
parentf57ee365e154ce6d15cd168112d94a9a8ff27094 (diff)
downloadrails-f8542a64b30bb6f67bcedf0c82de1291aab3c3d9.tar.gz
rails-f8542a64b30bb6f67bcedf0c82de1291aab3c3d9.tar.bz2
rails-f8542a64b30bb6f67bcedf0c82de1291aab3c3d9.zip
Make sure the benchmarking render method always returns the result of the render, regardless of whether logging is enabled or not.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1371 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/render_test.rb')
-rw-r--r--actionpack/test/controller/render_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index d3051ef6ad..98d279055d 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -1,6 +1,8 @@
require File.dirname(__FILE__) + '/../abstract_unit'
-Customer = Struct.new("Customer", :name)
+unless defined?(Customer)
+ Customer = Struct.new("Customer", :name)
+end
module Fun
class GamesController < ActionController::Base
@@ -214,4 +216,4 @@ class RenderTest < Test::Unit::TestCase
def process_request
TestController.process(@request, @response)
end
-end \ No newline at end of file
+end