1 files changed, 24 insertions, 26 deletions
diff --git a/actionpack/test/dispatch/exception_wrapper_test.rb b/actionpack/test/dispatch/exception_wrapper_test.rb
index 7a29a7ff97..dfbb91c0ca 100644
--- a/actionpack/test/dispatch/exception_wrapper_test.rb
+++ b/actionpack/test/dispatch/exception_wrapper_test.rb
@@ -17,51 +17,49 @@ module ActionDispatch
     end
 
     setup do
-      Rails.stubs(:root).returns(Pathname.new('.'))
-
-      cleaner = ActiveSupport::BacktraceCleaner.new
-      cleaner.add_silencer { |line| line !~ /^lib/ }
-
-      @environment = { 'action_dispatch.backtrace_cleaner' => cleaner }
+      @cleaner = ActiveSupport::BacktraceCleaner.new
+      @cleaner.add_silencer { |line| line !~ /^lib/ }
     end
 
     test '#source_extracts fetches source fragments for every backtrace entry' do
       exception = TestError.new("lib/file.rb:42:in `index'")
-      wrapper = ExceptionWrapper.new({}, exception)
-
-      wrapper.expects(:source_fragment).with('lib/file.rb', 42).returns('foo')
+      wrapper = ExceptionWrapper.new(nil, exception)
 
-      assert_equal [ code: 'foo', line_number: 42 ], wrapper.source_extracts
+      assert_called_with(wrapper, :source_fragment, ['lib/file.rb', 42], returns: 'foo') do
+        assert_equal [ code: 'foo', line_number: 42 ], wrapper.source_extracts
+      end
     end
 
     test '#source_extracts works with Windows paths' do
       exc = TestError.new("c:/path/to/rails/app/controller.rb:27:in 'index':")
 
-      wrapper = ExceptionWrapper.new({}, exc)
-      wrapper.expects(:source_fragment).with('c:/path/to/rails/app/controller.rb', 27).returns('nothing')
+      wrapper = ExceptionWrapper.new(nil, exc)
 
-      assert_equal [ code: 'nothing', line_number: 27 ], wrapper.source_extracts
+      assert_called_with(wrapper, :source_fragment, ['c:/path/to/rails/app/controller.rb', 27], returns: 'nothing') do
+        assert_equal [ code: 'nothing', line_number: 27 ], wrapper.source_extracts
+      end
     end
 
     test '#source_extracts works with non standard backtrace' do
       exc = TestError.new('invalid')
 
-      wrapper = ExceptionWrapper.new({}, exc)
-      wrapper.expects(:source_fragment).with('invalid', 0).returns('nothing')
+      wrapper = ExceptionWrapper.new(nil, exc)
 
-      assert_equal [ code: 'nothing', line_number: 0 ], wrapper.source_extracts
+      assert_called_with(wrapper, :source_fragment, ['invalid', 0], returns: 'nothing') do
+        assert_equal [ code: 'nothing', line_number: 0 ], wrapper.source_extracts
+      end
     end
 
     test '#application_trace returns traces only from the application' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
-      wrapper = ExceptionWrapper.new(@environment, exception)
+      wrapper = ExceptionWrapper.new(@cleaner, exception)
 
       assert_equal [ "lib/file.rb:42:in `index'" ], wrapper.application_trace
     end
 
     test '#application_trace cannot be nil' do
-      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
-      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+      nil_backtrace_wrapper = ExceptionWrapper.new(@cleaner, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new(nil, BadlyDefinedError.new)
 
       assert_equal [], nil_backtrace_wrapper.application_trace
       assert_equal [], nil_cleaner_wrapper.application_trace
@@ -69,14 +67,14 @@ module ActionDispatch
 
     test '#framework_trace returns traces outside the application' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
-      wrapper = ExceptionWrapper.new(@environment, exception)
+      wrapper = ExceptionWrapper.new(@cleaner, exception)
 
       assert_equal caller, wrapper.framework_trace
     end
 
     test '#framework_trace cannot be nil' do
-      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
-      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+      nil_backtrace_wrapper = ExceptionWrapper.new(@cleaner, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new(nil, BadlyDefinedError.new)
 
       assert_equal [], nil_backtrace_wrapper.framework_trace
       assert_equal [], nil_cleaner_wrapper.framework_trace
@@ -84,14 +82,14 @@ module ActionDispatch
 
     test '#full_trace returns application and framework traces' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
-      wrapper = ExceptionWrapper.new(@environment, exception)
+      wrapper = ExceptionWrapper.new(@cleaner, exception)
 
       assert_equal exception.backtrace, wrapper.full_trace
     end
 
     test '#full_trace cannot be nil' do
-      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
-      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+      nil_backtrace_wrapper = ExceptionWrapper.new(@cleaner, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new(nil, BadlyDefinedError.new)
 
       assert_equal [], nil_backtrace_wrapper.full_trace
       assert_equal [], nil_cleaner_wrapper.full_trace
@@ -99,7 +97,7 @@ module ActionDispatch
 
     test '#traces returns every trace by category enumerated with an index' do
       exception = TestError.new("lib/file.rb:42:in `index'", "/gems/rack.rb:43:in `index'")
-      wrapper = ExceptionWrapper.new(@environment, exception)
+      wrapper = ExceptionWrapper.new(@cleaner, exception)
 
       assert_equal({
         'Application Trace' => [ id: 0, trace: "lib/file.rb:42:in `index'" ],