1 files changed, 25 insertions, 32 deletions

diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index a867aee7ec..f9f379780c 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -71,14 +71,6 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  def setup
-    app = ActiveSupport::OrderedOptions.new
-    app.config = ActiveSupport::OrderedOptions.new
-    app.config.assets = ActiveSupport::OrderedOptions.new
-    app.config.assets.prefix = '/sprockets'
-    Rails.stubs(:application).returns(app)
-  end
-
   RoutesApp = Struct.new(:routes).new(SharedTestRoutes)
   ProductionApp  = ActionDispatch::DebugExceptions.new(Boomer.new(false), RoutesApp)
   DevelopmentApp = ActionDispatch::DebugExceptions.new(Boomer.new(true), RoutesApp)
@@ -338,36 +330,37 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
 
   test 'debug exceptions app shows user code that caused the error in source view' do
     @app = DevelopmentApp
-    Rails.stubs(:root).returns(Pathname.new('.'))
-    cleaner = ActiveSupport::BacktraceCleaner.new.tap do |bc|
-      bc.add_silencer { |line| line =~ /method_that_raises/ }
-      bc.add_silencer { |line| line !~ %r{test/dispatch/debug_exceptions_test.rb} }
-    end
+    Rails.stub :root, Pathname.new('.') do
+      cleaner = ActiveSupport::BacktraceCleaner.new.tap do |bc|
+        bc.add_silencer { |line| line =~ /method_that_raises/ }
+        bc.add_silencer { |line| line !~ %r{test/dispatch/debug_exceptions_test.rb} }
+      end
 
-    get '/framework_raises', headers: { 'action_dispatch.backtrace_cleaner' => cleaner }
+      get '/framework_raises', headers: { 'action_dispatch.backtrace_cleaner' => cleaner }
 
-    # Assert correct error
-    assert_response 500
-    assert_select 'h2', /error in framework/
+      # Assert correct error
+      assert_response 500
+      assert_select 'h2', /error in framework/
 
-    # assert source view line is the call to method_that_raises
-    assert_select 'div.source:not(.hidden)' do
-      assert_select 'pre .line.active', /method_that_raises/
-    end
+      # assert source view line is the call to method_that_raises
+      assert_select 'div.source:not(.hidden)' do
+        assert_select 'pre .line.active', /method_that_raises/
+      end
 
-    # assert first source view (hidden) that throws the error
-    assert_select 'div.source:first' do
-      assert_select 'pre .line.active', /raise StandardError\.new/
-    end
+      # assert first source view (hidden) that throws the error
+      assert_select 'div.source:first' do
+        assert_select 'pre .line.active', /raise StandardError\.new/
+      end
 
-    # assert application trace refers to line that calls method_that_raises is first
-    assert_select '#Application-Trace' do
-      assert_select 'pre code a:first', %r{test/dispatch/debug_exceptions_test\.rb:\d+:in `call}
-    end
+      # assert application trace refers to line that calls method_that_raises is first
+      assert_select '#Application-Trace' do
+        assert_select 'pre code a:first', %r{test/dispatch/debug_exceptions_test\.rb:\d+:in `call}
+      end
 
-    # assert framework trace that that threw the error is first
-    assert_select '#Framework-Trace' do
-      assert_select 'pre code a:first', /method_that_raises/
+      # assert framework trace that that threw the error is first
+      assert_select '#Framework-Trace' do
+        assert_select 'pre code a:first', /method_that_raises/
+      end
     end
   end
 end