diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-22 15:26:03 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-22 15:26:03 +0100 |
| commit | 5f3f100ce2d689480da85abc88e5e940cf90189e (patch) | |
| tree | 15c1a05a5308a9eea56d7f0889ac46d9cac5b57c /actionpack/test/controller/benchmark_test.rb | |
| parent | d758d996d1b66e2a65640f79f01ce2ac674d7ed5 (diff) | |
| parent | ca49299434bc764b667cd86846d892e91a150ef3 (diff) | |
| download | rails-5f3f100ce2d689480da85abc88e5e940cf90189e.tar.gz rails-5f3f100ce2d689480da85abc88e5e940cf90189e.tar.bz2 rails-5f3f100ce2d689480da85abc88e5e940cf90189e.zip | |
Merge branch 'master' into active_model
Conflicts:
activeresource/lib/active_resource/validations.rb
Diffstat (limited to 'actionpack/test/controller/benchmark_test.rb')
| -rw-r--r-- | actionpack/test/controller/benchmark_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/benchmark_test.rb b/actionpack/test/controller/benchmark_test.rb index f9100a2313..66ebfcf20a 100644 --- a/actionpack/test/controller/benchmark_test.rb +++ b/actionpack/test/controller/benchmark_test.rb @@ -20,6 +20,7 @@ class BenchmarkTest < ActionController::TestCase end def setup + super # benchmark doesn't do anything unless a logger is set @controller.logger = MockLogger.new @request.host = "test.actioncontroller.i" |