Skip to content

Commit 8e1714b

Browse files
committed
- Added test for verifying that we treat line number indications from irb as user/lib code
- Cleaned up backtrace cleaner test code and removed instaces variables
1 parent 1eb3582 commit 8e1714b

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed
Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
require 'abstract_unit'
22
require 'rails/backtrace_cleaner'
33

4-
class BacktraceCleanerVendorGemTest < ActiveSupport::TestCase
4+
class BacktraceCleanerTest < ActiveSupport::TestCase
55
def setup
66
@cleaner = Rails::BacktraceCleaner.new
77
end
88

99
test "should format installed gems correctly" do
10-
@backtrace = [ "#{Gem.path[0]}/gems/nosuchgem-1.2.3/lib/foo.rb" ]
11-
@result = @cleaner.clean(@backtrace, :all)
12-
assert_equal "nosuchgem (1.2.3) lib/foo.rb", @result[0]
10+
backtrace = [ "#{Gem.path[0]}/gems/nosuchgem-1.2.3/lib/foo.rb" ]
11+
result = @cleaner.clean(backtrace, :all)
12+
assert_equal "nosuchgem (1.2.3) lib/foo.rb", result[0]
1313
end
1414

1515
test "should format installed gems not in Gem.default_dir correctly" do
16-
@target_dir = Gem.path.detect { |p| p != Gem.default_dir }
16+
target_dir = Gem.path.detect { |p| p != Gem.default_dir }
1717
# skip this test if default_dir is the only directory on Gem.path
1818
if @target_dir
19-
@backtrace = [ "#{@target_dir}/gems/nosuchgem-1.2.3/lib/foo.rb" ]
20-
@result = @cleaner.clean(@backtrace, :all)
21-
assert_equal "nosuchgem (1.2.3) lib/foo.rb", @result[0]
19+
backtrace = [ "#{target_dir}/gems/nosuchgem-1.2.3/lib/foo.rb" ]
20+
result = @cleaner.clean(backtrace, :all)
21+
assert_equal "nosuchgem (1.2.3) lib/foo.rb", result[0]
2222
end
2323
end
24+
25+
test "should consider traces from irb lines as User code" do
26+
backtrace = [ "from (irb):1",
27+
"from /Path/to/rails/railties/lib/rails/commands/console.rb:77:in `start'",
28+
"from bin/rails:4:in `<main>'" ]
29+
result = @cleaner.clean(backtrace, :all)
30+
assert_equal "from (irb):1", result[0]
31+
end
2432
end

0 commit comments

Comments
 (0)