Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove old commented code/logic for Rack 1.6 logic/quirks #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chadlwilson merged 1 commit into from
Aug 12, 2025
Merged

Remove old commented code/logic for Rack 1.6 logic/quirks #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions src/spec/ruby/rack/handler/servlet_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,14 +325,6 @@ def _env; @_env end
it "exposes the servlet context xxxx" do
env = servlet.create_env @servlet_env
expect( env['java.servlet_context'] ).to be_a javax.servlet.ServletContext
# Failure/Error: env['java.servlet_context'].should == @servlet_context
# NoMethodError:
# private method `pretty_print' called for #<RSpec::Mocks::ErrorGenerator:0x1e9d469>
#begin
# env['java.servlet_context'].should == @servlet_context
#rescue NoMethodError
# ( env['java.servlet_context'] == @servlet_context ).should be true
#end
end

it "exposes the rack context" do
Expand Down Expand Up @@ -371,7 +363,7 @@ def getAttributeNames
it "sets attributes with false/null values" do
@servlet_request.addHeader "Content-Type", "text/plain"
@servlet_request.setContentType 'text/html'
@servlet_request.setContent ('0' * 100).to_java_bytes rescue nil # 1.6.8 BUG
@servlet_request.setContent ('0' * 100).to_java_bytes
@servlet_request.setAttribute 'org.false', false
@servlet_request.setAttribute 'null.attr', nil
@servlet_request.setAttribute 'the.truth', java.lang.Boolean::TRUE
Expand Down Expand Up @@ -419,19 +411,10 @@ def getAttributeNames
env = servlet.create_env(@servlet_env)
rack_request = Rack::Request.new(env)

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

expect( rack_request.GET['foo'] ).to eql('0')
expect( rack_request.GET['baz_'] ).to eql('2')

if rack_release('1.6')
# expect( rack_request.GET['bar['] ).to eql('1')
else
expect( rack_request.GET.key?('bar') ).to be true
end
expect( rack_request.GET['meh'] ).to eql('3')

expect( rack_request.query_string ).to eql 'foo]=0&bar[=1&baz_=2&[meh=3'
Expand Down Expand Up @@ -491,7 +474,7 @@ def getAttributeNames

expect { rack_request.GET }.to raise_error(error, "expected Hash (got Array) for param `foo'")
rack_request.POST.should == {}
expect { rack_request.params }.to raise_error(error, "expected Hash (got Array) for param `foo'") if rack_release('1.6')
expect { rack_request.params }.to raise_error(error, "expected Hash (got Array) for param `foo'")

rack_request.query_string.should == 'foo[]=0&foo[bar]=1'
end
Expand Down
9 changes: 4 additions & 5 deletions src/spec/ruby/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,11 @@ def servlet_30?
end
private :servlet_30?

def rack_release(at_least = nil)
require 'rack'; release = Rack.release
release = '1.6' if Gem.loaded_specs['rack'].version.to_s == '1.6.0'
at_least.nil? ? release : release >= at_least
def rack_release_at_least?(at_least = nil)
require 'rack';
at_least ? Rack.release >= at_least : true
end
private :rack_release
private :rack_release_at_least?

def raise_logger(level = 'WARN')
org.jruby.rack.logging.RaiseLogger.new(level, JRuby.runtime.out)
Expand Down