diff options
| author | lifo <lifo@null.lan> | 2009-04-17 14:06:26 +0100 |
|---|---|---|
| committer | lifo <lifo@null.lan> | 2009-04-17 14:06:26 +0100 |
| commit | 20401783cf26f903d7020cb7136b1e78e60e71ea (patch) | |
| tree | 5bb029802ade6dda33e051adf74915dc0a8d1fe5 /actionpack/test/controller/capture_test.rb | |
| parent | f99e9f627b6e4ab7fe72bc759426312ec0c7a2cd (diff) | |
| parent | abb899c54e8777428b7a607774370ba29a5573bd (diff) | |
| download | rails-20401783cf26f903d7020cb7136b1e78e60e71ea.tar.gz rails-20401783cf26f903d7020cb7136b1e78e60e71ea.tar.bz2 rails-20401783cf26f903d7020cb7136b1e78e60e71ea.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base.rb
railties/guides/source/caching_with_rails.textile
Diffstat (limited to 'actionpack/test/controller/capture_test.rb')
| -rw-r--r-- | actionpack/test/controller/capture_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb index 6dfa0995eb..9a0976ca9f 100644 --- a/actionpack/test/controller/capture_test.rb +++ b/actionpack/test/controller/capture_test.rb @@ -27,6 +27,7 @@ class CaptureTest < ActionController::TestCase tests CaptureController def setup + super # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get # a more accurate simulation of what happens in "real life". @controller.logger = Logger.new(nil) |