Avoid creating new controller constants during test runtime. All routable controllers should be defined beforehand.

1 files changed, 18 insertions, 9 deletions

diff --git a/actionpack/test/lib/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index 2e8c5090ca..7a0216e73c 100644
--- a/actionpack/test/lib/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
@@ -1,24 +1,33 @@
 class << Object; alias_method :const_available?, :const_defined?; end
 
-class ContentController < ActionController::Base
-end
-class NotAController
-end
+class ContentController < ActionController::Base; end
+class NotAController; end
+
 module Admin
   class << self; alias_method :const_available?, :const_defined?; end
   class UserController < ActionController::Base; end
   class NewsFeedController < ActionController::Base; end
 end
-class ElsewhereController < ActionController::Base; end
+
+module Api
+  class ProductsController < ActionController::Base; end
+end
+
+# TODO: Reduce the number of test controllers we use
 class AddressesController < ActionController::Base; end
-class SessionsController  < ActionController::Base; end
-class FooController < ActionController::Base; end
+class ArticlesController < ActionController::Base; end
+class BarController < ActionController::Base; end
+class BooksController < ActionController::Base; end
+class BraveController < ActionController::Base; end
 class CController < ActionController::Base; end
+class ElsewhereController < ActionController::Base; end
+class FooController < ActionController::Base; end
 class HiController < ActionController::Base; end
-class BraveController < ActionController::Base; end
 class ImageController < ActionController::Base; end
+class PeopleController < ActionController::Base; end
+class SessionsController  < ActionController::Base; end
+class SubpathBooksController < ActionController::Base; end
 class WeblogController < ActionController::Base; end
-class BarController < ActionController::Base; end
 
 # For speed test
 class SpeedController < ActionController::Base;  end