From 05adf524c6905eb5ac448e473cc64baa3571fd51 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 26 May 2011 01:37:34 +0900
Subject: Ensure RDoc::Task exists even if 'rdoc/task' was not required

---
 railties/test/railties/railtie_test.rb | 7 +------
 railties/test/railties/shared_tests.rb | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'railties/test')

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
-- 
cgit v1.2.3