diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2011-05-26 01:37:34 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2011-05-26 01:37:34 +0900 |
| commit | 05adf524c6905eb5ac448e473cc64baa3571fd51 (patch) | |
| tree | d445009e8f0ec9bd2b946d914b7ba00395930ba8 /railties/test | |
| parent | ee46bb73d44338b7dfb8976cc59d742b9394148a (diff) | |
| download | rails-05adf524c6905eb5ac448e473cc64baa3571fd51.tar.gz rails-05adf524c6905eb5ac448e473cc64baa3571fd51.tar.bz2 rails-05adf524c6905eb5ac448e473cc64baa3571fd51.zip | |
Ensure RDoc::Task exists even if 'rdoc/task' was not required
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/railties/railtie_test.rb | 7 | ||||
| -rw-r--r-- | railties/test/railties/shared_tests.rb | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb index 4b94942e1f..18fdf59fe3 100644 --- a/railties/test/railties/railtie_test.rb +++ b/railties/test/railties/railtie_test.rb @@ -97,12 +97,7 @@ module RailtiesTest assert !$ran_block require 'rake' require 'rake/testtask' - begin - require 'rdoc/task' - rescue LoadError - require 'rake/rdoctask' - end - + require 'rdoc/task' AppTemplate::Application.load_tasks assert $ran_block diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb index fdeddcf659..659551d08a 100644 --- a/railties/test/railties/shared_tests.rb +++ b/railties/test/railties/shared_tests.rb @@ -237,11 +237,7 @@ module RailtiesTest boot_rails require 'rake' - begin - require 'rdoc/task' - rescue LoadError - require 'rake/rdoctask' - end + require 'rdoc/task' require 'rake/testtask' Rails.application.load_tasks Rake::Task[:foo].invoke |