summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-06-10 21:15:21 +0000
committerEric Wong <normalperson@yhbt.net>2010-06-10 21:17:43 +0000
commit25bfeb87bbc6266e7e20a2b7fec21b84c8ca0e2c (patch)
tree9bc555185fc90ac2dca4885a7d91249e3474db22
parentc5357d45d506caafee2a90ac550c4c00b4b15ed1 (diff)
Rails 3 will automatically load it for us.
-rwxr-xr-xbin/unicorn_rails4
-rwxr-xr-xt/t0300-rails3-basic.sh2
2 files changed, 2 insertions, 4 deletions
diff --git a/bin/unicorn_rails b/bin/unicorn_rails
index e9cac00..3614fd4 100755
--- a/bin/unicorn_rails
+++ b/bin/unicorn_rails
@@ -176,9 +176,7 @@ def rails_builder(ru, opts, daemonize)
         use Rails::Rack::LogTailer unless daemonize
         use Rails::Rack::Debugger if $DEBUG
         map(map_path) do
-          if defined?(ActionDispatch::Static)
-            use ActionDispatch::Static, "#{Rails.root}/public"
-          else
+          unless defined?(ActionDispatch::Static)
             use Rails::Rack::Static
           end
           run rails_dispatcher
diff --git a/t/t0300-rails3-basic.sh b/t/t0300-rails3-basic.sh
index 3021276..8bf4066 100755
--- a/t/t0300-rails3-basic.sh
+++ b/t/t0300-rails3-basic.sh
@@ -18,7 +18,7 @@ t_begin "setup and start" && {
 
 # add more tests here
 t_begin "hit with curl" && {
-        curl -v http://$listen/ || :
+        test xHELLO = x"$(curl -sSf http://$listen/x.txt)"
 }
 
 t_begin "killing succeeds" && {