Update body spec to use server context.

Author: ioquatix

spec/async/http/body_spec.rb

@@ -11,109 +11,100 @@
 
 require 'async/io/ssl_socket'
 
-require 'async/rspec/reactor'
+require_relative 'server_context'
 
 require 'localhost/authority'
 
 RSpec.shared_examples Async::HTTP::Body do
 	let(:client) {Async::HTTP::Client.new(client_endpoint, protocol: described_class)}
 
-	it "can stream requests" do
-		server = Async::HTTP::Server.for(server_endpoint, protocol: described_class) do |request|
-			input = request.body
-			output = Async::HTTP::Body::Writable.new
-			
-			Async::Task.current.async do |task|
-				input.each do |chunk|
-					output.write(chunk.reverse)
+	context 'with echo server' do
+		let(:server) do
+			Async::HTTP::Server.for(server_endpoint, protocol: described_class) do |request|
+				input = request.body
+				output = Async::HTTP::Body::Writable.new
+				
+				Async::Task.current.async do |task|
+					input.each do |chunk|
+						output.write(chunk.reverse)
+					end
+					
+					output.close
 				end
 
+				Protocol::HTTP::Response[200, [], output]
+			end	
+		end
+		
+		it "can stream requests" do
+			output = Async::HTTP::Body::Writable.new
+			
+			reactor.async do |task|
+				output.write("Hello World!")
 				output.close
 			end
 
-			Protocol::HTTP::Response[200, [], output]
-		end
-		
-		server_task = reactor.async do
-			server.run
-		end
-		
-		output = Async::HTTP::Body::Writable.new
-		
-		reactor.async do |task|
-			output.write("Hello World!")
-			output.close
+			response = client.post("/", {}, output)
+			
+			expect(response).to be_success
+			expect(response.read).to be == "!dlroW olleH"
 		end
-		
-		response = client.post("/", {}, output)
-		
-		expect(response).to be_success
-		expect(response.read).to be == "!dlroW olleH"
-		
-		server_task.stop
-		client.close
 	end
 
-	it "can stream response" do
-		notification = Async::Notification.new
+	context "with streaming server" do
+		let(:notification) {Async::Notification.new}
 
-		server = Async::HTTP::Server.for(server_endpoint, protocol: described_class) do |request|
-			body = Async::HTTP::Body::Writable.new
-			
-			Async::Task.current.async do |task|
-				10.times do |i|
-					body.write("#{i}")
-					notification.wait
+		let(:server) do
+			Async::HTTP::Server.for(server_endpoint, protocol: described_class) do |request|
+				body = Async::HTTP::Body::Writable.new
+				
+				Async::Task.current.async do |task|
+					10.times do |i|
+						body.write("#{i}")
+						notification.wait
+					end
+					
+					body.close
 				end
 
-				body.close
+				Protocol::HTTP::Response[200, {}, body]
 			end
-			
-			Protocol::HTTP::Response[200, {}, body]
 		end
 
-		server_task = reactor.async do
-			server.run
-		end
-		
-		response = client.get("/")
-		
-		expect(response).to be_success
-		
-		j = 0
-		# This validates interleaving
-		response.body.each do |line|
-			expect(line.to_i).to be == j
-			j += 1
+		it "can stream response" do
+			response = client.get("/")
 
-			notification.signal
-		end
-		
-		server_task.stop
-		client.close
+			expect(response).to be_success
+			
+			j = 0
+			# This validates interleaving
+			response.body.each do |line|
+				expect(line.to_i).to be == j
+				j += 1
+				
+				notification.signal
+			end
+		end	
 	end
 end
 
 RSpec.describe Async::HTTP::Protocol::HTTP1 do
-	include_context Async::RSpec::Reactor
-	
-	let(:endpoint) {Async::HTTP::Endpoint.parse('http://127.0.0.1:9296', reuse_port: true)}
-	let(:client_endpoint) {endpoint}
-	let(:server_endpoint) {endpoint}
+	include_context Async::HTTP::Server
 
 	it_should_behave_like Async::HTTP::Body
 end
 
 RSpec.describe Async::HTTP::Protocol::HTTPS do
-	include_context Async::RSpec::Reactor
+	include_context Async::HTTP::Server
+	
 	let(:authority) {Localhost::Authority.new}
 
 	let(:server_context) {authority.server_context}
 	let(:client_context) {authority.client_context}
 
 	# Shared port for localhost network tests.
-	let(:server_endpoint) {Async::HTTP::Endpoint.parse("https://localhost:9296", ssl_context: server_context)}
-	let(:client_endpoint) {Async::HTTP::Endpoint.parse("https://localhost:9296", ssl_context: client_context)}
+	let(:server_endpoint) {Async::HTTP::Endpoint.parse("https://localhost:9299", ssl_context: server_context, reuse_port: true)}
+	let(:client_endpoint) {Async::HTTP::Endpoint.parse("https://localhost:9299", ssl_context: client_context, reuse_port: true)}
 
 	it_should_behave_like Async::HTTP::Body
 end

spec/async/http/server_context.rb

@@ -14,6 +14,9 @@
 	let(:protocol) {described_class}
 	let(:endpoint) {Async::HTTP::Endpoint.parse('http://127.0.0.1:9294', timeout: 0.8, reuse_port: true, protocol: protocol)}
 
+	let(:server_endpoint) {endpoint}
+	let(:client_endpoint) {endpoint}
+	
 	let(:retries) {1}
 
 	let(:server) do
@@ -24,17 +27,17 @@
 
 	before do
 		# We bind the endpoint before running the server so that we know incoming connections will be accepted:
-		@bound_endpoint = Async::IO::SharedEndpoint.bound(endpoint)
+		@bound_endpoint = Async::IO::SharedEndpoint.bound(server_endpoint)
 
 		# I feel a dedicated class might be better than this hack:
-		allow(@bound_endpoint).to receive(:protocol).and_return(endpoint.protocol)
-		allow(@bound_endpoint).to receive(:scheme).and_return(endpoint.scheme)
+		allow(@bound_endpoint).to receive(:protocol).and_return(server_endpoint.protocol)
+		allow(@bound_endpoint).to receive(:scheme).and_return(server_endpoint.scheme)
 
 		@server_task = Async do
 			server.run
 		end
 
-		@client = Async::HTTP::Client.new(endpoint, protocol: endpoint.protocol, retries: retries)
+		@client = Async::HTTP::Client.new(client_endpoint, protocol: endpoint.protocol, retries: retries)
 	end
 
 	after do