move Rails 2.3.x test to Rails 2.3.8

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).
defunkt · Jun 3, 2010 · 8e55e56 · 8e55e56
1 parent 4b44e21
commit 8e55e56
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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 → test/rails/app-2.3.8/.gitignore b/test/rails/app-2.3.5/.gitignore → test/rails/app-2.3.8/.gitignore
diff --git a/test/rails/app-2.3.5/Rakefile → test/rails/app-2.3.8/Rakefile b/test/rails/app-2.3.5/Rakefile → test/rails/app-2.3.8/Rakefile
diff --git a/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
diff --git a/...p-2.3.5/app/controllers/foo_controller.rb → ...p-2.3.8/app/controllers/foo_controller.rb b/...p-2.3.5/app/controllers/foo_controller.rb → ...p-2.3.8/app/controllers/foo_controller.rb
diff --git a/...p-2.3.5/app/helpers/application_helper.rb → ...p-2.3.8/app/helpers/application_helper.rb b/...p-2.3.5/app/helpers/application_helper.rb → ...p-2.3.8/app/helpers/application_helper.rb
diff --git a/test/rails/app-2.3.5/config/boot.rb → test/rails/app-2.3.8/config/boot.rb b/test/rails/app-2.3.5/config/boot.rb → test/rails/app-2.3.8/config/boot.rb
diff --git a/test/rails/app-2.3.5/config/database.yml → test/rails/app-2.3.8/config/database.yml b/test/rails/app-2.3.5/config/database.yml → test/rails/app-2.3.8/config/database.yml
diff --git a/test/rails/app-2.3.5/config/environment.rb → test/rails/app-2.3.8/config/environment.rb b/test/rails/app-2.3.5/config/environment.rb → test/rails/app-2.3.8/config/environment.rb
diff --git a/...-2.3.5/config/environments/development.rb → ...-2.3.8/config/environments/development.rb b/...-2.3.5/config/environments/development.rb → ...-2.3.8/config/environments/development.rb
diff --git a/...p-2.3.5/config/environments/production.rb → ...p-2.3.8/config/environments/production.rb b/...p-2.3.5/config/environments/production.rb → ...p-2.3.8/config/environments/production.rb
diff --git a/test/rails/app-2.3.5/config/routes.rb → test/rails/app-2.3.8/config/routes.rb b/test/rails/app-2.3.5/config/routes.rb → test/rails/app-2.3.8/config/routes.rb
diff --git a/test/rails/app-2.3.5/db/.gitignore → test/rails/app-2.3.8/db/.gitignore b/test/rails/app-2.3.5/db/.gitignore → test/rails/app-2.3.8/db/.gitignore
diff --git a/test/rails/app-2.3.5/log/.gitignore → test/rails/app-2.3.8/log/.gitignore b/test/rails/app-2.3.5/log/.gitignore → test/rails/app-2.3.8/log/.gitignore
diff --git a/test/rails/app-2.3.5/public/404.html → test/rails/app-2.3.8/public/404.html b/test/rails/app-2.3.5/public/404.html → test/rails/app-2.3.8/public/404.html
diff --git a/test/rails/app-2.3.5/public/500.html → test/rails/app-2.3.8/public/500.html b/test/rails/app-2.3.5/public/500.html → test/rails/app-2.3.8/public/500.html
diff --git a/test/rails/app-2.3.5/public/x.txt → test/rails/app-2.3.8/public/x.txt b/test/rails/app-2.3.5/public/x.txt → test/rails/app-2.3.8/public/x.txt