parent
cb4f651282
commit
932665fe15
|
@ -1168,7 +1168,7 @@ module Sinatra
|
||||||
/^\(.*\)$/, # generated code
|
/^\(.*\)$/, # generated code
|
||||||
/rubygems\/(custom|core_ext\/kernel)_require\.rb$/, # rubygems require hacks
|
/rubygems\/(custom|core_ext\/kernel)_require\.rb$/, # rubygems require hacks
|
||||||
/active_support/, # active_support require hacks
|
/active_support/, # active_support require hacks
|
||||||
/bundler(\/runtime)?\.rb/, # bundler require hacks
|
/bundler(\/(?:runtime|inline))?\.rb/, # bundler require hacks
|
||||||
/<internal:/, # internal in ruby >= 1.9.2
|
/<internal:/, # internal in ruby >= 1.9.2
|
||||||
/src\/kernel\/bootstrap\/[A-Z]/ # maglev kernel files
|
/src\/kernel\/bootstrap\/[A-Z]/ # maglev kernel files
|
||||||
]
|
]
|
||||||
|
|
|
@ -186,6 +186,12 @@ class SettingsTest < Minitest::Test
|
||||||
@base.enable :methodoverride
|
@base.enable :methodoverride
|
||||||
assert @base.methodoverride?
|
assert @base.methodoverride?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'ignores bundler/inline from callers' do
|
||||||
|
@application.stub(:caller, ->(_){ ['/path/to/bundler/inline.rb', $0] }) do
|
||||||
|
assert_equal File.expand_path($0), File.expand_path(@application.send(:caller_files).first)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'run' do
|
describe 'run' do
|
||||||
|
|
Loading…
Reference in New Issue