Skip to content
This repository
Browse code

cherry picked 05adf52 for 3-0-stable. Original Author: amatsuda

  • Loading branch information...
commit bbfd65299f258fa85042c01fe2d8985d69588417 1 parent 81b01b7
Vijay Dev authored June 06, 2011
6  Rakefile
@@ -2,11 +2,7 @@ gem 'rdoc', '>= 2.5.10'
2 2
 require 'rdoc'
3 3
 
4 4
 require 'rake'
5  
-begin
6  
-  require 'rdoc/task'
7  
-rescue LoadError
8  
-  require 'rake/rdoctask'
9  
-end
  5
+require 'rdoc/task'
10 6
 
11 7
 $:.unshift File.expand_path('..', __FILE__)
12 8
 require "tasks/release"
2  railties/lib/rails/tasks/documentation.rake
... ...
@@ -1,7 +1,9 @@
1 1
 begin
2 2
   require 'rdoc/task'
3 3
 rescue LoadError
  4
+  require 'rdoc/rdoc'
4 5
   require 'rake/rdoctask'
  6
+  RDoc::Task = Rake::RDocTask
5 7
 end
6 8
 
7 9
 # Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
7  railties/test/railties/railtie_test.rb
@@ -85,12 +85,7 @@ class MyTie < Rails::Railtie
85 85
       assert !$ran_block
86 86
       require 'rake'
87 87
       require 'rake/testtask'
88  
-      begin
89  
-        require 'rdoc/task'
90  
-      rescue LoadError
91  
-        require 'rake/rdoctask'
92  
-      end
93  
-
  88
+      require 'rdoc/task'
94 89
 
95 90
       AppTemplate::Application.load_tasks
96 91
       assert $ran_block
6  railties/test/railties/shared_tests.rb
@@ -170,11 +170,7 @@ def test_rake_tasks_lib_tasks_are_loaded
170 170
 
171 171
       boot_rails
172 172
       require 'rake'
173  
-      begin
174  
-        require 'rdoc/task'
175  
-      rescue LoadError
176  
-        require 'rake/rdoctask'
177  
-      end
  173
+      require 'rdoc/task'
178 174
       require 'rake/testtask'
179 175
       Rails.application.load_tasks
180 176
       Rake::Task[:foo].invoke

0 notes on commit bbfd652

Please sign in to comment.
Something went wrong with that request. Please try again.