httprb · olegkovalenko · Jan 18, 2015 · Jan 18, 2015 · Jan 19, 2015 · Jan 19, 2015
diff --git a/spec/lib/http_spec.rb b/spec/lib/http_spec.rb
@@ -41,35 +41,49 @@
     end
   end
 
-  context "with http proxy address and port" do
-    it "proxies the request" do
-      response = HTTP.via("127.0.0.1", 8080).get dummy.endpoint
-      expect(response.headers["X-Proxied"]).to eq "true"
+  context "with http proxy" do
+    let(:handler) { proc { |_, res| res["X-PROXIED"] = true } }
+
+    context "address and port" do
+      it "proxies the request" do
+        with_proxy(8080, handler) do
+          response = HTTP.via("127.0.0.1", 8080).get dummy.endpoint
+          expect(response.headers["X-Proxied"]).to eq "true"
+        end
+      end
     end
-  end
 
-  context "with http proxy address, port username and password" do
-    it "proxies the request" do
-      response = HTTP.via("127.0.0.1", 8081, "username", "password").get dummy.endpoint
-      expect(response.headers["X-Proxied"]).to eq "true"
-    end
+    context "address, port username and password" do
+      it "proxies the request" do
+        with_auth_proxy(8081, handler, :user => "username", :password => "password") do
+          response = HTTP.via("127.0.0.1", 8081, "username", "password").get dummy.endpoint
+          expect(response.headers["X-Proxied"]).to eq "true"
+        end
+      end
 
-    it 'responds with the endpoint\'s body' do
-      response = HTTP.via("127.0.0.1", 8081, "username", "password").get dummy.endpoint
-      expect(response.to_s).to match(/<!doctype html>/)
+      it "responds with the endpoint\'s body" do
+        with_auth_proxy(8081, handler, :user => "username", :password => "password") do
+          response = HTTP.via("127.0.0.1", 8081, "username", "password").get dummy.endpoint
+          expect(response.to_s).to match(/<!doctype html>/)
+        end
+      end
     end
-  end
 
-  context "with http proxy address, port, with wrong username and password" do
-    it "responds with 407" do
-      response = HTTP.via("127.0.0.1", 8081, "user", "pass").get dummy.endpoint
-      expect(response.status).to eq(407)
+    context "address, port, with wrong username and password" do
+      it "responds with 407" do
+        with_auth_proxy(8081, handler, :user => "username", :password => "password") do
+          response = HTTP.via("127.0.0.1", 8081, "user", "pass").get dummy.endpoint
+          expect(response.status).to eq(407)
+        end
+      end
     end
-  end
 
-  context "without proxy port" do
-    it "raises an argument error" do
-      expect { HTTP.via("127.0.0.1") }.to raise_error HTTP::RequestError
+    context "without proxy port" do
+      it "raises an argument error" do
+        with_proxy(8080, handler) do
+          expect { HTTP.via("127.0.0.1") }.to raise_error HTTP::RequestError
+        end
+      end
     end
   end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -19,6 +19,7 @@
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+
   config.expect_with :rspec do |expectations|
     # This option will default to `true` in RSpec 4. It makes the `description`
     # and `failure_message` of custom matchers include text for helper methods

diff --git a/spec/support/example_server.rb b/spec/support/example_server.rb
@@ -0,0 +1,21 @@
+require "webrick"
+require "singleton"
+require "forwardable"
+
+require "support/example_server/servlet"
+
+class ExampleServer
+  extend  Forwardable
+
+  include Singleton
+
+  PORT = 65_432
+  ADDR = "127.0.0.1:#{PORT}"
+
+  def initialize
+    @server = WEBrick::HTTPServer.new :Port => PORT, :AccessLog => []
+    @server.mount "/", Servlet
+  end
+
+  delegate [:start, :shutdown] => :@server
+end
diff --git a/spec/support/proxy_server.rb b/spec/support/proxy_server.rb
@@ -1,31 +1,38 @@
+require "support/black_hole"
 require "webrick/httpproxy"
 
-handler = proc { |_, res| res["X-PROXIED"] = true }
+def with_proxy(port, handler, options = {})
+  proxy = WEBrick::HTTPProxyServer.new({
+    :Port => port,
+    :AccessLog => [],
+    :ProxyContentHandler => handler,
+    :Logger => BlackHole
+  }.merge(options))
 
-ProxyServer = WEBrick::HTTPProxyServer.new(
-  :Port => 8080,
-  :AccessLog => [],
-  :RequestCallback => handler
-)
+  oversee_webrick_server(proxy) { yield proxy }
+end
+
+def with_auth_proxy(port, handler, options = {})
+  username = options.fetch(:user)
+  password = options.fetch(:password)
 
-AuthenticatedProxyServer = WEBrick::HTTPProxyServer.new(
-  :Port => 8081,
-  :ProxyAuthProc => proc do | req, res |
-    WEBrick::HTTPAuth.proxy_basic_auth(req, res, "proxy") do | user, pass |
-      user == "username" && pass == "password"
+  auth_proc = proc do | req, res |
+    WEBrick::HTTPAuth.proxy_basic_auth(req, res, "proxy") do |user, pass|
+      user == username && pass == password
     end
-  end,
-  :RequestCallback => handler
-)
+  end
 
-Thread.new  { ProxyServer.start }
-trap("INT") do
-  ProxyServer.shutdown
-  exit
+  with_proxy(port, handler, options.merge(:ProxyAuthProc => auth_proc)) { |proxy| yield proxy }
 end
 
-Thread.new  { AuthenticatedProxyServer.start }
-trap("INT") do
-  AuthenticatedProxyServer.shutdown
-  exit
+def oversee_webrick_server(server)
+  thread = Thread.new { server.start }
+  Thread.pass while thread.status != "sleep"
+
+  begin
+    yield server
+  ensure
+    server.shutdown
+    thread.join
+  end
 end