diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
| commit | 5e60e6571384a809598f3118fdc02dac1fd9d7b8 (patch) | |
| tree | 3cfccbc36f0133124181ab965480a1352d86ca79 /railties/test | |
| parent | 51a9703b1e80caa30d699f30615f023079874623 (diff) | |
| parent | 1a50cc31639f35fd82a4a24821b9fc49dc7eadc9 (diff) | |
| download | rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.gz rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.bz2 rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/initializers/notifications_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb index 276950c78c..fc8548af1f 100644 --- a/railties/test/application/initializers/notifications_test.rb +++ b/railties/test/application/initializers/notifications_test.rb @@ -37,7 +37,7 @@ module ApplicationTests ActiveRecord::Base.logger = logger = MockLogger.new - # Mimic ActiveRecord notifications + # Mimic Active Record notifications instrument "sql.active_record", :name => "SQL", :sql => "SHOW tables" wait |