Move adapter-version specific tests back to adapter.rb.

Author: ioquatix

fixtures/protocol/rack/an_adapter.rb

@@ -22,6 +22,10 @@ def self.parse_file(...)
 					::Rack::Builder.parse_file(...).first
 				end
 
+				def self.streaming?
+					false
+				end
+				
 				# Initialize the rack adaptor middleware.
 				# @parameter app [Object] The rack middleware.
 				def initialize(app)

lib/protocol/rack/adapter/generic.rb

@@ -20,6 +20,10 @@ def self.parse_file(...)
 					::Rack::Builder.parse_file(...)
 				end
 
+				def self.streaming?
+					true
+				end
+				
 				def make_environment(request)
 					request_path, query_string = request.path.split("?", 2)
 					server_name, server_port = (request.authority || "").split(":", 2)

lib/protocol/rack/adapter/rack3.rb

@@ -3,12 +3,152 @@
 # Released under the MIT License.
 # Copyright, 2022-2024, by Samuel Williams.
 
+require "sus/fixtures/console"
+
 require "protocol/rack/adapter"
+require "protocol/rack/server_context"
+
+require "rack/lint"
 
 describe Protocol::Rack::Adapter do
+	include Sus::Fixtures::Console::CapturedLogger
+	
 	let(:rackup_path) {File.expand_path(".adapter/config.ru", __dir__)}
 
 	it "can load rackup files" do
 		expect(subject.parse_file(rackup_path)).to be_a(Proc)
 	end
+	
+	AnApplication = Sus::Shared("an application") do
+		include Protocol::Rack::ServerContext
+		
+		let(:protocol) {subject}
+		
+		with "successful response" do
+			let(:app) do
+				::Rack::Lint.new(
+					lambda do |env|
+						[200, {}, ["Hello World!"]]
+					end
+				)
+			end
+			
+			let(:response) {client.get("/")}
+			
+			it "get valid HTTP_HOST" do
+				expect(response.read).to be == "Hello World!"
+			end
+		end
+		
+		with "HTTP_HOST" do
+			let(:app) do
+				lambda do |env|
+					[200, {}, ["HTTP_HOST: #{env['HTTP_HOST']}"]]
+				end
+			end
+			
+			let(:response) {client.get("/")}
+			
+			it "get valid HTTP_HOST" do
+				expect(response.read).to be =~ /HTTP_HOST: (.*?):(\d+)+/
+			end
+		end
+		
+		with "connection: close", timeout: 1 do
+			let(:app) do
+				lambda do |env|
+					[200, {"connection" => "close"}, ["Hello World!"]]
+				end
+			end
+			
+			let(:response) {client.get("/")}
+			
+			it "get valid response" do
+				expect(response.read).to be == "Hello World!"
+			end
+		end
+		
+		with "non-string header value" do
+			let(:app) do
+				lambda do |env|
+					[200, {"x-custom" => 123}, ["Hello World!"]]
+				end
+			end
+			
+			let(:response) {client.get("/")}
+			
+			it "get valid response" do
+				expect(response.read).to be == "Hello World!"
+				expect(response.headers["x-custom"]).to be == ["123"]
+			end
+		end
+		
+		with "REQUEST_URI", timeout: 1 do
+			let(:app) do
+				lambda do |env|
+					[200, {}, ["REQUEST_URI: #{env['REQUEST_URI']}"]]
+				end
+			end
+			
+			let(:response) {client.get("/?foo=bar")}
+			
+			it "get valid REQUEST_URI" do
+				expect(response.read).to be == "REQUEST_URI: /?foo=bar"
+			end
+		end
+		
+		with "streaming response" do
+			let(:app) do
+				lambda do |env|
+					body = lambda do |stream|
+						stream.write("Hello Streaming World")
+						stream.close
+					end
+					
+					[200, {}, body]
+				end
+			end
+			
+			let(:response) {client.get("/")}
+			
+			it "can read streaming response" do
+				skip "Streaming response not supported"
+				
+				expect(response.read).to be == "Hello Streaming World"
+			end
+		end
+		
+		with "error handling" do
+			let(:response) {client.get("/")}
+			
+			with "nil response" do
+				let(:app) {->(env) {nil}}
+				
+				it "raises an error" do
+					expect(response.status).to be == 500
+					expect(response.read).to be == "ArgumentError: Status must be an integer!"
+				end
+			end
+			
+			with "nil headers" do
+				let(:app) {->(env) {[200, nil, []]}}
+				
+				it "raises an error" do
+					expect(response.status).to be == 500
+					expect(response.read).to be == "ArgumentError: Headers must not be nil!"
+				end
+			end
+		end
+	end
+	
+	[
+		Async::HTTP::Protocol::HTTP10,
+		Async::HTTP::Protocol::HTTP11,
+		Async::HTTP::Protocol::HTTP2,
+	].each do |klass|
+		describe(klass, unique: klass.name) do
+			# The adapter is Rack version specific, so we run integration tests in CI with different versions of Rack to ensure compatibility.
+			it_behaves_like AnApplication
+		end
+	end
 end

test/protocol/rack/adapter.rb

@@ -4,7 +4,6 @@
 # Copyright, 2022-2024, by Samuel Williams.
 
 require "sus/fixtures/console"
-require "protocol/rack/an_adapter"
 require "protocol/rack/adapter/rack2"
 
 describe Protocol::Rack::Adapter::Rack2 do
@@ -17,8 +16,6 @@
 	let(:request) {Protocol::HTTP::Request.new("https", "example.com", "GET", "/", "http/1.1", Protocol::HTTP::Headers[{"accept" => "text/html"}], body)}
 	let(:response) {adapter.call(request)}
 
-	it_behaves_like Protocol::Rack::AnAdapter
-	
 	with "set-cookie headers that has multiple values" do
 		let(:app) {->(env) {[200, {"set-cookie" => "a=b\nx=y"}, []]}}
 

test/protocol/rack/adapter/rack2.rb

@@ -6,7 +6,6 @@
 require "sus/fixtures/console"
 
 require "protocol/http/request"
-require "protocol/rack/an_adapter"
 require "protocol/rack/adapter/rack3"
 
 describe Protocol::Rack::Adapter::Rack3 do
@@ -19,8 +18,6 @@
 	let(:request) {Protocol::HTTP::Request.new("https", "example.com", "GET", "/", "http/1.1", Protocol::HTTP::Headers[{"accept" => "text/html"}], body)}
 	let(:response) {adapter.call(request)}
 
-	it_behaves_like Protocol::Rack::AnAdapter
-	
 	with "set-cookie headers that has multiple values" do
 		let(:app) {->(env) {[200, {"set-cookie" => ["a=b", "x=y"]}, []]}}
 

test/protocol/rack/adapter/rack3.rb

@@ -6,7 +6,6 @@
 require "sus/fixtures/console"
 
 require "protocol/http/request"
-require "protocol/rack/an_adapter"
 require "protocol/rack/adapter/rack31"
 
 describe Protocol::Rack::Adapter::Rack31 do
@@ -19,8 +18,6 @@
 	let(:request) {Protocol::HTTP::Request.new("https", "example.com", "GET", "/", "http/1.1", Protocol::HTTP::Headers[{"accept" => "text/html"}], body)}
 	let(:response) {adapter.call(request)}
 
-	it_behaves_like Protocol::Rack::AnAdapter
-	
 	with "set-cookie headers that has multiple values" do
 		let(:app) {->(env) {[200, {"set-cookie" => ["a=b", "x=y"]}, []]}}