From 9d80b009a3cb795530ad23263f4eb525880e79dc Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 8 Dec 2010 23:53:25 +0000
Subject: configurator: ensure examples in FAQ still work

This has been broken since 2.0.x
Internal cleanups sometimes have unintended consequences :<
---
 lib/unicorn/configurator.rb       |  1 +
 t/t0015-configurator-internals.sh | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100755 t/t0015-configurator-internals.sh

diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb
index 2a83dea..3cacb91 100644
--- a/lib/unicorn/configurator.rb
+++ b/lib/unicorn/configurator.rb
@@ -9,6 +9,7 @@ require 'logger'
 # nginx is also available at
 # http://unicorn.bogomips.org/examples/nginx.conf
 class Unicorn::Configurator
+  include Unicorn
   attr_accessor :set, :config_file, :after_reload
 
   # :stopdoc:
diff --git a/t/t0015-configurator-internals.sh b/t/t0015-configurator-internals.sh
new file mode 100755
index 0000000..4e3acbe
--- /dev/null
+++ b/t/t0015-configurator-internals.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 4 "configurator internals tests (from FAQ)"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	cat >> $unicorn_config <<EOF
+HttpRequest::DEFAULTS["rack.url_scheme"] = "https"
+Configurator::DEFAULTS[:logger].formatter = Logger::Formatter.new
+EOF
+	unicorn -D -c $unicorn_config env.ru
+	unicorn_wait_start
+}
+
+t_begin "single request" && {
+	curl -sSfv http://$listen/ | grep '"rack.url_scheme"=>"https"'
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "no errors" && check_stderr
+
+t_done
-- 
cgit v1.2.3-24-ge0c7