|
1 | 1 | # frozen_string_literal: true
|
2 | 2 |
|
3 |
| -require "isolation/abstract_unit" |
4 |
| -require "rack/test" |
5 | 3 | require "env_helpers"
|
6 | 4 |
|
7 | 5 | module ApplicationTests
|
8 | 6 | class BacktraceCleanerTest < ActiveSupport::TestCase
|
9 |
| - include ActiveSupport::Testing::Isolation |
10 |
| - include Rack::Test::Methods |
11 | 7 | include EnvHelpers
|
12 | 8 |
|
13 |
| - def teardown |
14 |
| - teardown_app |
| 9 | + setup do |
| 10 | + @cleaner = Rails::BacktraceCleaner.new |
15 | 11 | end
|
16 | 12 |
|
17 |
| - test "backtrace is cleaned" do |
18 |
| - setup_app |
| 13 | + test "#clean silences Rails code from backtrace" do |
| 14 | + backtrace = [ |
| 15 | + "app/controllers/foo_controller.rb:4:in 'index'", |
| 16 | + "rails/railties/lib/rails/engine.rb:536:in `call" |
| 17 | + ] |
19 | 18 |
|
20 |
| - app("development") |
21 |
| - get "/" |
22 |
| - if RUBY_VERSION >= "3.4" |
23 |
| - assert_includes last_response.body, "app/app/controllers/foo_controller.rb:4:in 'FooController#index'" |
24 |
| - else |
25 |
| - assert_includes last_response.body, "app/app/controllers/foo_controller.rb:4:in `index'" |
26 |
| - end |
27 |
| - assert_not_includes last_response.body, "rails/railties/test/env_helpers.rb" |
| 19 | + cleaned = @cleaner.clean(backtrace) |
| 20 | + |
| 21 | + assert_equal ["app/controllers/foo_controller.rb:4:in 'index'"], cleaned |
28 | 22 | end
|
29 | 23 |
|
30 |
| - test "backtrace is not cleaned" do |
| 24 | + test "#clean does not silence when BACKTRACE is set" do |
31 | 25 | switch_env("BACKTRACE", "1") do
|
32 |
| - setup_app |
| 26 | + backtrace = [ |
| 27 | + "app/app/controllers/foo_controller.rb:4:in 'index'", |
| 28 | + "/rails/railties/lib/rails/engine.rb:536:in `call" |
| 29 | + ] |
| 30 | + |
| 31 | + cleaned = @cleaner.clean(backtrace) |
33 | 32 |
|
34 |
| - app("development") |
35 |
| - get "/" |
36 |
| - if RUBY_VERSION >= "3.4" |
37 |
| - assert_includes last_response.body, "app/app/controllers/foo_controller.rb:4:in 'FooController#index'" |
38 |
| - else |
39 |
| - assert_includes last_response.body, "app/app/controllers/foo_controller.rb:4:in `index'" |
40 |
| - end |
41 |
| - assert_includes last_response.body, "rails/railties/test/env_helpers.rb" |
| 33 | + assert_equal backtrace, cleaned |
42 | 34 | end
|
43 | 35 | end
|
44 | 36 |
|
45 |
| - private |
46 |
| - def setup_app |
47 |
| - build_app |
| 37 | + test "#clean_frame silences Rails code" do |
| 38 | + frame = "rails/railties/lib/rails/engine.rb:536:in `call" |
48 | 39 |
|
49 |
| - controller :foo, <<-RUBY |
50 |
| - class FooController < ApplicationController |
51 |
| - def index |
52 |
| - begin |
53 |
| - raise "ERROR" |
54 |
| - rescue StandardError => e |
55 |
| - render plain: e.backtrace.join("\n") |
56 |
| - end |
57 |
| - end |
58 |
| - end |
59 |
| - RUBY |
| 40 | + cleaned = @cleaner.clean_frame(frame) |
| 41 | + |
| 42 | + assert_equal nil, cleaned |
| 43 | + end |
60 | 44 |
|
61 |
| - app_file "config/routes.rb", <<-RUBY |
62 |
| - Rails.application.routes.draw do |
63 |
| - root to: "foo#index" |
64 |
| - end |
65 |
| - RUBY |
| 45 | + test "#clean_frame does not silence when BACKTRACE is set" do |
| 46 | + switch_env("BACKTRACE", "1") do |
| 47 | + frame = "rails/railties/lib/rails/engine.rb:536:in `call" |
| 48 | + |
| 49 | + cleaned = @cleaner.clean_frame(frame) |
| 50 | + |
| 51 | + assert_equal frame, cleaned |
66 | 52 | end
|
| 53 | + end |
67 | 54 | end
|
68 | 55 | end
|
0 commit comments