summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-06-03 22:53:28 +0000
committerEric Wong <normalperson@yhbt.net>2010-06-03 22:58:08 +0000
commit8e55e561a1bcba57bf429c9c2111ec5351fcb1b3 (patch)
tree9b46547b67dff0f6b655081b3cfc24c25da09593
parent4b44e21957e4cb8ec6ace5604fbe096dfd8959d2 (diff)
This allows us to gets rid of the Rack 1.0.1 dependency when
running Rails tests since previous versions of Rails 2.3.x
needed Rack 1.0.1, where as Rails 2.2.x and below could be used
with any version of Rack (under Unicorn only).
-rw-r--r--FAQ5
-rw-r--r--GNUmakefile7
-rw-r--r--test/rails/app-2.3.8/.gitignore (renamed from test/rails/app-2.3.5/.gitignore)0
-rw-r--r--test/rails/app-2.3.8/Rakefile (renamed from test/rails/app-2.3.5/Rakefile)0
-rw-r--r--test/rails/app-2.3.8/app/controllers/application_controller.rb (renamed from test/rails/app-2.3.5/app/controllers/application_controller.rb)0
-rw-r--r--test/rails/app-2.3.8/app/controllers/foo_controller.rb (renamed from test/rails/app-2.3.5/app/controllers/foo_controller.rb)0
-rw-r--r--test/rails/app-2.3.8/app/helpers/application_helper.rb (renamed from test/rails/app-2.3.5/app/helpers/application_helper.rb)0
-rw-r--r--test/rails/app-2.3.8/config/boot.rb (renamed from test/rails/app-2.3.5/config/boot.rb)0
-rw-r--r--test/rails/app-2.3.8/config/database.yml (renamed from test/rails/app-2.3.5/config/database.yml)0
-rw-r--r--test/rails/app-2.3.8/config/environment.rb (renamed from test/rails/app-2.3.5/config/environment.rb)0
-rw-r--r--test/rails/app-2.3.8/config/environments/development.rb (renamed from test/rails/app-2.3.5/config/environments/development.rb)0
-rw-r--r--test/rails/app-2.3.8/config/environments/production.rb (renamed from test/rails/app-2.3.5/config/environments/production.rb)0
-rw-r--r--test/rails/app-2.3.8/config/routes.rb (renamed from test/rails/app-2.3.5/config/routes.rb)0
-rw-r--r--test/rails/app-2.3.8/db/.gitignore (renamed from test/rails/app-2.3.5/db/.gitignore)0
-rw-r--r--test/rails/app-2.3.8/log/.gitignore (renamed from test/rails/app-2.3.5/log/.gitignore)0
-rw-r--r--test/rails/app-2.3.8/public/404.html (renamed from test/rails/app-2.3.5/public/404.html)0
-rw-r--r--test/rails/app-2.3.8/public/500.html (renamed from test/rails/app-2.3.5/public/500.html)0
-rw-r--r--test/rails/app-2.3.8/public/x.txt (renamed from test/rails/app-2.3.5/public/x.txt)0
18 files changed, 9 insertions, 3 deletions
diff --git a/FAQ b/FAQ
index 75f373b..c84a8af 100644
--- a/FAQ
+++ b/FAQ
@@ -1,11 +1,12 @@
 = Frequently Asked Questions about Unicorn
 
-===  I've installed Rack 1.1.x, why can't Unicorn load Rails?
+===  I've installed Rack 1.1.x, why can't Unicorn load Rails (2.3.5)?
 
 Rails 2.3.5 is not compatible with Rack 1.1.x.  Unicorn is compatible
 with both Rack 1.1.x and Rack 1.0.x, and RubyGems will load the latest
 version of Rack installed on the system.  Uninstalling the Rack 1.1.x
-gem should solve gem loading issues with Rails 2.3.x.
+gem should solve gem loading issues with Rails 2.3.5.  Rails 2.3.6
+and later correctly support Rack 1.1.x.
 
 === Why are my redirects going to "http" URLs when my site uses https?
 
diff --git a/GNUmakefile b/GNUmakefile
index ca25518..35df2f2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -208,6 +208,11 @@ $(rails_git)/info/cloned-stamp:
         git clone --mirror -q $(rails_git_url) $(rails_git)
         > $@
 
+$(rails_git)/info/v2.3.8-stamp: $(rails_git)/info/cloned-stamp
+        cd $(rails_git) && git fetch
+        cd $(rails_git) && git rev-parse --verify refs/tags/v2.3.8
+        > $@
+
 rails_tests := $(addsuffix .r,$(addprefix $(T_r).,$(rails_vers)))
 test-rails: $(rails_tests)
 $(T_r).%.r: t = $(addsuffix $(log_suffix),$@)
@@ -218,7 +223,7 @@ $(T_r).%.r: export PATH := $(test_prefix)/bin:$(PATH)
 $(T_r).%.r: export RUBYLIB := $(test_prefix):$(test_prefix)/lib:$(RUBYLIB)
 $(T_r).%.r: export UNICORN_RAILS_TEST_VERSION = $(rv)
 $(T_r).%.r: export RAILS_GIT_REPO = $(CURDIR)/$(rails_git)
-$(T_r).%.r: $(test_prefix)/.stamp $(rails_git)/info/cloned-stamp
+$(T_r).%.r: $(test_prefix)/.stamp $(rails_git)/info/v2.3.8-stamp
         $(run_test)
 
 ifneq ($(VERSION),)
diff --git a/test/rails/app-2.3.5/.gitignore b/test/rails/app-2.3.8/.gitignore
index f451f91..f451f91 100644
--- a/test/rails/app-2.3.5/.gitignore
+++ b/test/rails/app-2.3.8/.gitignore
diff --git a/test/rails/app-2.3.5/Rakefile b/test/rails/app-2.3.8/Rakefile
index fbebfca..fbebfca 100644
--- a/test/rails/app-2.3.5/Rakefile
+++ b/test/rails/app-2.3.8/Rakefile
diff --git a/test/rails/app-2.3.5/app/controllers/application_controller.rb b/test/rails/app-2.3.8/app/controllers/application_controller.rb
index 07c333e..07c333e 100644
--- a/test/rails/app-2.3.5/app/controllers/application_controller.rb
+++ b/test/rails/app-2.3.8/app/controllers/application_controller.rb
diff --git a/test/rails/app-2.3.5/app/controllers/foo_controller.rb b/test/rails/app-2.3.8/app/controllers/foo_controller.rb
index 54ca1ed..54ca1ed 100644
--- a/test/rails/app-2.3.5/app/controllers/foo_controller.rb
+++ b/test/rails/app-2.3.8/app/controllers/foo_controller.rb
diff --git a/test/rails/app-2.3.5/app/helpers/application_helper.rb b/test/rails/app-2.3.8/app/helpers/application_helper.rb
index d9889b3..d9889b3 100644
--- a/test/rails/app-2.3.5/app/helpers/application_helper.rb
+++ b/test/rails/app-2.3.8/app/helpers/application_helper.rb
diff --git a/test/rails/app-2.3.5/config/boot.rb b/test/rails/app-2.3.8/config/boot.rb
index b6c80d5..b6c80d5 100644
--- a/test/rails/app-2.3.5/config/boot.rb
+++ b/test/rails/app-2.3.8/config/boot.rb
diff --git a/test/rails/app-2.3.5/config/database.yml b/test/rails/app-2.3.8/config/database.yml
index 9f77843..9f77843 100644
--- a/test/rails/app-2.3.5/config/database.yml
+++ b/test/rails/app-2.3.8/config/database.yml
diff --git a/test/rails/app-2.3.5/config/environment.rb b/test/rails/app-2.3.8/config/environment.rb
index 6eb092c..6eb092c 100644
--- a/test/rails/app-2.3.5/config/environment.rb
+++ b/test/rails/app-2.3.8/config/environment.rb
diff --git a/test/rails/app-2.3.5/config/environments/development.rb b/test/rails/app-2.3.8/config/environments/development.rb
index 3d381d2..3d381d2 100644
--- a/test/rails/app-2.3.5/config/environments/development.rb
+++ b/test/rails/app-2.3.8/config/environments/development.rb
diff --git a/test/rails/app-2.3.5/config/environments/production.rb b/test/rails/app-2.3.8/config/environments/production.rb
index 08710a4..08710a4 100644
--- a/test/rails/app-2.3.5/config/environments/production.rb
+++ b/test/rails/app-2.3.8/config/environments/production.rb
diff --git a/test/rails/app-2.3.5/config/routes.rb b/test/rails/app-2.3.8/config/routes.rb
index ac7877c..ac7877c 100644
--- a/test/rails/app-2.3.5/config/routes.rb
+++ b/test/rails/app-2.3.8/config/routes.rb
diff --git a/test/rails/app-2.3.5/db/.gitignore b/test/rails/app-2.3.8/db/.gitignore
index e69de29..e69de29 100644
--- a/test/rails/app-2.3.5/db/.gitignore
+++ b/test/rails/app-2.3.8/db/.gitignore
diff --git a/test/rails/app-2.3.5/log/.gitignore b/test/rails/app-2.3.8/log/.gitignore
index 397b4a7..397b4a7 100644
--- a/test/rails/app-2.3.5/log/.gitignore
+++ b/test/rails/app-2.3.8/log/.gitignore
diff --git a/test/rails/app-2.3.5/public/404.html b/test/rails/app-2.3.8/public/404.html
index 44d986c..44d986c 100644
--- a/test/rails/app-2.3.5/public/404.html
+++ b/test/rails/app-2.3.8/public/404.html
diff --git a/test/rails/app-2.3.5/public/500.html b/test/rails/app-2.3.8/public/500.html
index e534a49..e534a49 100644
--- a/test/rails/app-2.3.5/public/500.html
+++ b/test/rails/app-2.3.8/public/500.html
diff --git a/test/rails/app-2.3.5/public/x.txt b/test/rails/app-2.3.8/public/x.txt
index e427984..e427984 100644
--- a/test/rails/app-2.3.5/public/x.txt
+++ b/test/rails/app-2.3.8/public/x.txt