1 files changed, 39 insertions, 12 deletions
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 475af90032..2e1f21c645 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -1,6 +1,7 @@
 require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'active_support/json/decoding'
+require 'rails/engine'
 
 class TestCaseTest < ActionController::TestCase
   class TestController < ActionController::Base
@@ -520,18 +521,6 @@ XML
     end
   end
 
-  def test_use_route
-    with_routing do |set|
-      set.draw do
-        get 'via_unnamed_route', to: 'test_case_test/test#test_uri'
-        get 'via_named_route', as: :a_named_route, to: 'test_case_test/test#test_uri'
-      end
-
-      get :test_uri, use_route: :a_named_route
-      assert_equal '/via_named_route', @response.body
-    end
-  end
-
   def test_assert_realistic_path_parameters
     get :test_params, :id => 20, :foo => Object.new
 
@@ -753,6 +742,44 @@ XML
   end
 end
 
+module EngineControllerTests
+  class Engine < ::Rails::Engine
+    isolate_namespace EngineControllerTests
+
+    routes.draw do
+      get '/' => 'bar#index'
+    end
+  end
+
+  class BarController < ActionController::Base
+    def index
+      render :text => 'bar'
+    end
+  end
+
+  class BarControllerTest < ActionController::TestCase
+    tests BarController
+
+    def test_engine_controller_route
+      get :index
+      assert_equal @response.body, 'bar'
+    end
+  end
+
+  class BarControllerTestWithExplicitRouteSet < ActionController::TestCase
+    tests BarController
+
+    def setup
+      @routes = Engine.routes
+    end
+
+    def test_engine_controller_route
+      get :index
+      assert_equal @response.body, 'bar'
+    end
+  end
+end
+
 class InferringClassNameTest < ActionController::TestCase
   def test_determine_controller_class
     assert_equal ContentController, determine_class("ContentControllerTest")