[test] Remove old servlet API < 3 support code

(cherry picked from commit 676f521)

Author: chadlwilson

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

@@ -901,22 +901,7 @@ def servlet.create_env(servlet_env)
       env = servlet.create_env @servlet_env
 
       expect(env['java.servlet_context']).to_not be nil
-      if servlet_30?
-        expect(env['java.servlet_context']).to be @servlet_context
-      else
-        expect(env['java.servlet_context']).to be @rack_context
-
-        # HACK to emulate Servlet API 3.0 MockHttpServletRequest has getServletContext :
-        env = Rack::Handler::Servlet::DefaultEnv.new(@servlet_request).to_hash
-
-        expect(env['java.servlet_context']).to_not be nil
-        expect(env['java.servlet_context']).to be @servlet_context
-        begin
-          expect(env['java.servlet_context']).to eq @servlet_context
-        rescue NoMethodError
-          expect((env['java.servlet_context'] == @servlet_context)).to eq true
-        end
-      end
+      expect(env['java.servlet_context']).to be @servlet_context
     end
 
     it "returns the servlet request when queried with java.servlet_request" do

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

@@ -76,8 +76,6 @@
   end
 
   it "is considered handled when more than Allow header is added with OPTIONS" do
-    pending "need Servlet API 3.0" unless servlet_30?
-
     servlet_request.method = 'OPTIONS'
 
     response_capture.setIntHeader "Answer", 42
@@ -87,8 +85,6 @@
   end
 
   it "is considered handled when header is added" do
-    pending "need Servlet API 3.0" unless servlet_30?
-
     servlet_request.method = 'OPTIONS'
 
     response_capture.addHeader "Hello", "World"

src/spec/ruby/spec_helper.rb

@@ -16,8 +16,8 @@
 
 require 'rspec'
 
-require 'jruby'; ext_class = org.jruby.rack.ext.RackLibrary
-JRuby.runtime.loadExtension 'JRuby::Rack', ext_class.new, true
+require 'jruby' # we rely on JRuby.runtime in a few places
+JRuby::Util.load_ext('org.jruby.rack.ext.RackLibrary')
 
 module SharedHelpers
 
@@ -54,23 +54,6 @@ def silence_warnings(&block)
     JRuby::Rack::Helpers.silence_warnings(&block)
   end
 
-  @@servlet_30 = nil
-
-  def servlet_30?
-    return @@servlet_30 unless @@servlet_30.nil?
-    @@servlet_30 = !!(Java::javax.servlet.AsyncContext rescue nil)
-  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
-  end
-
-  private :rack_release
-
   def raise_logger(level = 'WARN')
     org.jruby.rack.logging.RaiseLogger.new(level, JRuby.runtime.out)
   end