Fix isolated running of AddressesTest

2 files changed, 3 insertions, 6 deletions

diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
index 2d2a2745b0..c1cd22113d 100644
--- a/actionpack/test/controller/addresses_render_test.rb
+++ b/actionpack/test/controller/addresses_render_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'logger'
+require 'controller/fake_controllers'
 
 class Address
   def Address.count(conditions = nil, join = nil)
@@ -15,13 +16,8 @@ class Address
   end
 end
 
-class AddressesTestController < ActionController::Base
-  def self.controller_name; "addresses"; end
-  def self.controller_path; "addresses"; end
-end
-
 class AddressesTest < ActionController::TestCase
-  tests AddressesTestController
+  tests AddressesController
 
   def setup
     super
diff --git a/actionpack/test/lib/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index d41547b902..e7589e29ca 100644
--- a/actionpack/test/lib/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
@@ -10,6 +10,7 @@ module Admin
   class NewsFeedController < ActionController::Base; end
 end
 class ElsewhereController < ActionController::Base; end
+class AddressesController < ActionController::Base; end
 
 # For speed test
 class SpeedController < ActionController::Base;  end