Skip to content

Commit bfa69df

Browse files
committed
[test] Tidy specs to avoid requiring things until later
This makes it much easier to debug issues with requires, since they then don't affect every single test.
1 parent d8030d4 commit bfa69df

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

src/spec/ruby/rack/config_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require File.expand_path('spec_helper', File.dirname(__FILE__) + '/..')
22

3-
describe org.jruby.rack.DefaultRackConfig do
3+
describe 'org.jruby.rack.DefaultRackConfig' do
44

55
let(:config) do
66
config = org.jruby.rack.DefaultRackConfig.new
@@ -23,7 +23,7 @@
2323

2424
end
2525

26-
describe org.jruby.rack.servlet.ServletRackConfig do
26+
describe 'org.jruby.rack.servlet.ServletRackConfig' do
2727

2828
let(:config) do
2929
config = org.jruby.rack.servlet.ServletRackConfig.new(@servlet_context)

src/spec/ruby/spec_helper.rb

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,21 @@
2222

2323
module SharedHelpers
2424

25-
java_import 'org.jruby.rack.RackContext'
26-
java_import 'org.jruby.rack.RackConfig'
27-
java_import 'org.jruby.rack.servlet.ServletRackContext'
28-
java_import 'javax.servlet.ServletContext'
29-
java_import 'javax.servlet.ServletConfig'
30-
3125
def mock_servlet_context
32-
@servlet_context = ServletContext.impl {}
33-
@rack_config ||= RackConfig.impl {}
34-
@rack_context ||= ServletRackContext.impl {}
26+
@servlet_context = Java::JavaxServlet::ServletContext.impl {}
27+
@rack_config ||= Java::OrgJrubyRack::RackConfig.impl {}
28+
@rack_context ||= Java::OrgJrubyRackServlet::ServletRackContext.impl {}
3529
[@rack_context, @servlet_context].each do |context|
3630
allow(context).to receive(:log)
3731
allow(context).to receive(:isEnabled).and_return nil
3832
allow(context).to receive(:getInitParameter).and_return nil
3933
allow(context).to receive(:getRealPath).and_return "/"
4034
allow(context).to receive(:getResource).and_return nil
4135
allow(context).to receive(:getContextPath).and_return "/"
36+
allow(context).to receive(:init_parameter_names).and_return []
4237
end
4338
allow(@rack_context).to receive(:getConfig).and_return @rack_config
44-
@servlet_config ||= ServletConfig.impl {}
39+
@servlet_config ||= Java::JavaxServlet::ServletConfig.impl {}
4540
allow(@servlet_config).to receive(:getServletName).and_return "a Servlet"
4641
allow(@servlet_config).to receive(:getServletContext).and_return @servlet_context
4742
@servlet_context
@@ -151,8 +146,8 @@ def should_eval_as_not_nil(code)
151146

152147
config.backtrace_exclusion_patterns = [
153148
/bin\//,
154-
#/gems/,
155-
/spec\/spec_helper\.rb/,
149+
# /gems/,
150+
# /spec\/spec_helper\.rb/,
156151
]
157152

158153
end

0 commit comments

Comments
 (0)