From 24b28a2a0c6a58e177b07ce3ccf56dc975541780 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 26 May 2011 00:15:23 +0900
Subject: require 'rake/rdoctask' if failed to require 'rdoc/task'

fixes a regression introduced by b921679d0dd3d5ca16f0362c2b34e7703cfe15e5
require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
---
 railties/test/railties/railtie_test.rb | 7 ++++++-
 railties/test/railties/shared_tests.rb | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index 18fdf59fe3..4b94942e1f 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -97,7 +97,12 @@ module RailtiesTest
       assert !$ran_block
       require 'rake'
       require 'rake/testtask'
-      require 'rdoc/task'
+      begin
+        require 'rdoc/task'
+      rescue LoadError
+        require 'rake/rdoctask'
+      end
+
 
       AppTemplate::Application.load_tasks
       assert $ran_block
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index 659551d08a..fdeddcf659 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -237,7 +237,11 @@ module RailtiesTest
 
       boot_rails
       require 'rake'
-      require 'rdoc/task'
+      begin
+        require 'rdoc/task'
+      rescue LoadError
+        require 'rake/rdoctask'
+      end
       require 'rake/testtask'
       Rails.application.load_tasks
       Rake::Task[:foo].invoke
-- 
cgit v1.2.3