Skip to content

Commit 7167c4c

Browse files
committed
Remove old commented code/logic for Rack 1.6 logic/quirks
(cherry picked from commit 718da7e)
1 parent 18a1fa3 commit 7167c4c

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

src/spec/ruby/rack/handler/servlet_spec.rb

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,6 @@ def _env
333333
it "exposes the servlet context xxxx" do
334334
env = servlet.create_env @servlet_env
335335
expect(env['java.servlet_context']).to be_a javax.servlet.ServletContext
336-
# Failure/Error: env['java.servlet_context'].should == @servlet_context
337-
# NoMethodError:
338-
# private method `pretty_print' called for #<RSpec::Mocks::ErrorGenerator:0x1e9d469>
339-
#begin
340-
# env['java.servlet_context'].should == @servlet_context
341-
#rescue NoMethodError
342-
# ( env['java.servlet_context'] == @servlet_context ).should be true
343-
#end
344336
end
345337

346338
it "exposes the rack context" do
@@ -379,7 +371,7 @@ def getAttributeNames
379371
it "sets attributes with false/null values" do
380372
@servlet_request.addHeader "Content-Type", "text/plain"
381373
@servlet_request.setContentType 'text/html'
382-
@servlet_request.setContent ('0' * 100).to_java_bytes rescue nil # 1.6.8 BUG
374+
@servlet_request.setContent ('0' * 100).to_java_bytes
383375
@servlet_request.setAttribute 'org.false', false
384376
@servlet_request.setAttribute 'null.attr', nil
385377
@servlet_request.setAttribute 'the.truth', java.lang.Boolean::TRUE
@@ -427,19 +419,10 @@ def getAttributeNames
427419
env = servlet.create_env(@servlet_env)
428420
rack_request = Rack::Request.new(env)
429421

430-
# Rack (1.5.2) does it as :
431-
# { "foo" => "0", "bar" => nil, "baz_" => "2", "meh" => "3" }
432-
# 1.6.0 :
433422
# { "foo" => "0", "bar[" => "1", "baz_" => "2", "meh" => "3" }
434423

435424
expect(rack_request.GET['foo']).to eql('0')
436425
expect(rack_request.GET['baz_']).to eql('2')
437-
438-
if rack_release('1.6')
439-
# expect( rack_request.GET['bar['] ).to eql('1')
440-
else
441-
expect( rack_request.GET.key?('bar') ).to be true
442-
end
443426
expect(rack_request.GET['meh']).to eql('3')
444427

445428
expect(rack_request.query_string).to eql 'foo]=0&bar[=1&baz_=2&[meh=3'

0 commit comments

Comments
 (0)