1 files changed, 3 insertions, 17 deletions
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index a24de62b19..c445285538 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -1,19 +1,5 @@
 require 'abstract_unit'
 
-module ActionDispatch
-  class ShowExceptions
-    private
-      def public_path
-        "#{FIXTURE_LOAD_PATH}/public"
-      end
-
-      # Silence logger
-      def logger
-        nil
-      end
-  end
-end
-
 class RescueController < ActionController::Base
   class NotAuthorized < StandardError
   end
@@ -149,7 +135,7 @@ class RescueController < ActionController::Base
 
   def missing_template
   end
-  
+
   def io_error_in_view
     raise ActionView::TemplateError.new(nil, {}, IOError.new('this is io error'))
   end
@@ -311,7 +297,7 @@ class RescueControllerTest < ActionController::TestCase
   end
 end
 
-class RescueTest < ActionController::IntegrationTest
+class RescueTest < ActionDispatch::IntegrationTest
   class TestController < ActionController::Base
     class RecordInvalid < StandardError
       def message
@@ -371,7 +357,7 @@ class RescueTest < ActionController::IntegrationTest
   private
     def with_test_routing
       with_routing do |set|
-        set.draw do |map|
+        set.draw do
           match 'foo', :to => ::RescueTest::TestController.action(:foo)
           match 'invalid', :to => ::RescueTest::TestController.action(:invalid)
           match 'b00m', :to => ::RescueTest::TestController.action(:b00m)