Skip to content

Commit d6c6340

Browse files
Correct tests when running under rake w/ jruby directly
Co-authored-by: Joni Lahtinen <[email protected]>
1 parent 5f6f41d commit d6c6340

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

src/spec/ruby/rack/servlet/response_capture_spec.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,4 @@
103103
expect( response_capture.isHandled ).to be true
104104
expect( response_capture.getStatus ).to eql 200
105105
end
106-
107-
private
108-
109-
def servlet_30?
110-
Java::JavaClass.for_name('javax.servlet.AsyncContext') rescue nil
111-
end
112-
113106
end

src/spec/ruby/spec_helper.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def silence_warnings(&block)
6161

6262
def servlet_30?
6363
return @@servlet_30 unless @@servlet_30.nil?
64-
@@servlet_30 = !! ( Java::JavaClass.for_name('javax.servlet.AsyncContext') rescue nil )
64+
@@servlet_30 = !! ( Java::javax.servlet.AsyncContext rescue nil )
6565
end
6666
private :servlet_30?
6767

@@ -199,7 +199,6 @@ def should_not_eval_as_nil(code, runtime = @runtime) # alias
199199
/bin\//,
200200
#/gems/,
201201
/spec\/spec_helper\.rb/,
202-
/lib\/rspec\/(core|expectations|matchers|mocks)/
203202
]
204203

205204
end

0 commit comments

Comments
 (0)