Tidy up code.

ioquatix · ioquatix · commit 973231f607aa · 2020-03-31T00:24:58.000+13:00
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -64,7 +64,7 @@ def call(env)
 					end
 					
 					return @app.call(env)
-				rescue Errno::ETIMEDOUT => e
+				rescue Errno::ETIMEDOUT, Async::TimeoutError => e
 					raise ::Faraday::TimeoutError, e
 				rescue OpenSSL::SSL::SSLError => e
 					raise ::Faraday::SSLError, e
@@ -77,9 +77,9 @@ def call(env)
 
 				private
 
-				def with_timeout
+				def with_timeout(task: Async::Task.current)
 					if @timeout
-						Async::Task.current.with_timeout(@timeout, ::Faraday::TimeoutError) do
+						task.with_timeout(@timeout, ::Faraday::TimeoutError) do
 							yield
 						end
 					else
diff --git a/spec/async/http/faraday/adapter_spec.rb b/spec/async/http/faraday/adapter_spec.rb
@@ -26,41 +26,45 @@
 
 RSpec.describe Async::HTTP::Faraday::Adapter do
 	include_context Async::RSpec::Reactor
-
+	
 	let(:endpoint) {
 		Async::HTTP::Endpoint.parse('http://127.0.0.1:9294')
 	}
-
+	
 	def run_server(response = Protocol::HTTP::Response[204], response_delay: nil)
 		Async do |task|
 			begin
 				server_task = task.async do
 					app = Proc.new do
-						task.sleep(response_delay) if response_delay
+						if response_delay
+							task.sleep(response_delay)
+						end
+						
 						response
 					end
+					
 					Async::HTTP::Server.new(app, endpoint).run
 				end
-
+				
 				yield
 			ensure
 				server_task.stop
 			end
 		end.wait
 	end
-
+	
 	def get_response(url = endpoint.url, path = '/index', adapter_options: {})
 		connection = Faraday.new(url: url) do |faraday|
 			faraday.response :logger
 			faraday.adapter :async_http, adapter_options
 		end
-
+		
 		connection.get(path)
 	
 	ensure
 		connection&.close
 	end
-
+	
 	it "client can get resource" do
 		run_server(Protocol::HTTP::Response[200, {}, ['Hello World']]) do
 			expect(get_response.body).to eq 'Hello World'
@@ -74,42 +78,43 @@ def get_response(url = endpoint.url, path = '/index', adapter_options: {})
 			expect(response).to be_success
 		end
 	end
-
+	
 	it 'properly handles chunked responses' do
 		large_response_size = 65536
-
+		
 		run_server(Protocol::HTTP::Response[200, {}, ['.' * large_response_size]]) do
 			expect(get_response.body.size).to eq large_response_size
 		end
 	end
-
+	
 	it 'properly handles no content responses' do
 		run_server(Protocol::HTTP::Response[204]) do
 			expect(get_response.body).to be_nil
 		end
 	end
-
+	
 	it 'closes connection automatically if persistent option is set to false' do
 		run_server do
 			expect do
 				get_response(adapter_options: { persistent: false })
 			end.not_to raise_error
 		end
 	end
-
+	
 	it 'raises an exception if request times out' do
-		delay = 0.01
-
+		delay = 0.1
+		
 		run_server(response_delay: delay) do
 			expect do
-				get_response(adapter_options: { timeout: delay / 2 })
+				get_response(adapter_options: {timeout: delay / 2})
 			end.to raise_error(Faraday::TimeoutError)
+			
 			expect do
-				get_response(adapter_options: { timeout: delay * 2 })
+				get_response(adapter_options: {timeout: delay * 2})
 			end.not_to raise_error
 		end
 	end
-
+	
 	it 'wraps underlying exceptions into Faraday analogs' do
 		expect { get_response(endpoint.url, '/index') }.to raise_error(Faraday::ConnectionFailed)
 	end
