diff options
Diffstat (limited to 'test/rails')
49 files changed, 125 insertions, 11 deletions
diff --git a/test/rails/app-1.2.3/app/controllers/application.rb b/test/rails/app-1.2.3/app/controllers/application.rb index ae8cac0..e72474f 100644 --- a/test/rails/app-1.2.3/app/controllers/application.rb +++ b/test/rails/app-1.2.3/app/controllers/application.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + class ApplicationController < ActionController::Base # Pick a unique cookie name to distinguish our session data from others' session :session_key => "_unicorn_rails_test.#{rand}" diff --git a/test/rails/app-1.2.3/app/controllers/foo_controller.rb b/test/rails/app-1.2.3/app/controllers/foo_controller.rb index 8d877d1..52b7947 100644 --- a/test/rails/app-1.2.3/app/controllers/foo_controller.rb +++ b/test/rails/app-1.2.3/app/controllers/foo_controller.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + require 'digest/sha1' class FooController < ApplicationController def index diff --git a/test/rails/app-1.2.3/app/helpers/application_helper.rb b/test/rails/app-1.2.3/app/helpers/application_helper.rb index de6be79..d9889b3 100644 --- a/test/rails/app-1.2.3/app/helpers/application_helper.rb +++ b/test/rails/app-1.2.3/app/helpers/application_helper.rb @@ -1,2 +1,4 @@ +# -*- encoding: binary -*- + module ApplicationHelper end diff --git a/test/rails/app-1.2.3/config/boot.rb b/test/rails/app-1.2.3/config/boot.rb index 71c7d7c..84a5c18 100644 --- a/test/rails/app-1.2.3/config/boot.rb +++ b/test/rails/app-1.2.3/config/boot.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + unless defined?(RAILS_ROOT) root_path = File.join(File.dirname(__FILE__), '..') RAILS_ROOT = root_path diff --git a/test/rails/app-1.2.3/config/environment.rb b/test/rails/app-1.2.3/config/environment.rb index 2ef6b4a..e230a66 100644 --- a/test/rails/app-1.2.3/config/environment.rb +++ b/test/rails/app-1.2.3/config/environment.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + unless defined? RAILS_GEM_VERSION RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] # || '1.2.3' end diff --git a/test/rails/app-1.2.3/config/environments/development.rb b/test/rails/app-1.2.3/config/environments/development.rb index 032fb46..9d78f5e 100644 --- a/test/rails/app-1.2.3/config/environments/development.rb +++ b/test/rails/app-1.2.3/config/environments/development.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = false config.whiny_nils = true config.breakpoint_server = true diff --git a/test/rails/app-1.2.3/config/environments/production.rb b/test/rails/app-1.2.3/config/environments/production.rb index c4059e3..1e049b2 100644 --- a/test/rails/app-1.2.3/config/environments/production.rb +++ b/test/rails/app-1.2.3/config/environments/production.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = true config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true diff --git a/test/rails/app-1.2.3/config/routes.rb b/test/rails/app-1.2.3/config/routes.rb index 774028f..70816dc 100644 --- a/test/rails/app-1.2.3/config/routes.rb +++ b/test/rails/app-1.2.3/config/routes.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id.:format' map.connect ':controller/:action/:id' diff --git a/test/rails/app-2.0.2/app/controllers/application.rb b/test/rails/app-2.0.2/app/controllers/application.rb index 09705d1..e7bb740 100644 --- a/test/rails/app-2.0.2/app/controllers/application.rb +++ b/test/rails/app-2.0.2/app/controllers/application.rb @@ -1,2 +1,4 @@ +# -*- encoding: binary -*- + class ApplicationController < ActionController::Base end diff --git a/test/rails/app-2.0.2/app/controllers/foo_controller.rb b/test/rails/app-2.0.2/app/controllers/foo_controller.rb index 8d877d1..52b7947 100644 --- a/test/rails/app-2.0.2/app/controllers/foo_controller.rb +++ b/test/rails/app-2.0.2/app/controllers/foo_controller.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + require 'digest/sha1' class FooController < ApplicationController def index diff --git a/test/rails/app-2.0.2/app/helpers/application_helper.rb b/test/rails/app-2.0.2/app/helpers/application_helper.rb index de6be79..d9889b3 100644 --- a/test/rails/app-2.0.2/app/helpers/application_helper.rb +++ b/test/rails/app-2.0.2/app/helpers/application_helper.rb @@ -1,2 +1,4 @@ +# -*- encoding: binary -*- + module ApplicationHelper end diff --git a/test/rails/app-2.0.2/config/boot.rb b/test/rails/app-2.0.2/config/boot.rb index 71c7d7c..84a5c18 100644 --- a/test/rails/app-2.0.2/config/boot.rb +++ b/test/rails/app-2.0.2/config/boot.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + unless defined?(RAILS_ROOT) root_path = File.join(File.dirname(__FILE__), '..') RAILS_ROOT = root_path diff --git a/test/rails/app-2.0.2/config/environment.rb b/test/rails/app-2.0.2/config/environment.rb index 7c720f6..9961f08 100644 --- a/test/rails/app-2.0.2/config/environment.rb +++ b/test/rails/app-2.0.2/config/environment.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + unless defined? RAILS_GEM_VERSION RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] end diff --git a/test/rails/app-2.0.2/config/environments/development.rb b/test/rails/app-2.0.2/config/environments/development.rb index 6a613c1..5e0f1ca 100644 --- a/test/rails/app-2.0.2/config/environments/development.rb +++ b/test/rails/app-2.0.2/config/environments/development.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = false config.whiny_nils = true config.action_controller.consider_all_requests_local = true diff --git a/test/rails/app-2.0.2/config/environments/production.rb b/test/rails/app-2.0.2/config/environments/production.rb index c4059e3..1e049b2 100644 --- a/test/rails/app-2.0.2/config/environments/production.rb +++ b/test/rails/app-2.0.2/config/environments/production.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = true config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true diff --git a/test/rails/app-2.0.2/config/routes.rb b/test/rails/app-2.0.2/config/routes.rb index 774028f..70816dc 100644 --- a/test/rails/app-2.0.2/config/routes.rb +++ b/test/rails/app-2.0.2/config/routes.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id.:format' map.connect ':controller/:action/:id' diff --git a/test/rails/app-2.1.2/app/controllers/application.rb b/test/rails/app-2.1.2/app/controllers/application.rb index 09705d1..e7bb740 100644 --- a/test/rails/app-2.1.2/app/controllers/application.rb +++ b/test/rails/app-2.1.2/app/controllers/application.rb @@ -1,2 +1,4 @@ +# -*- encoding: binary -*- + class ApplicationController < ActionController::Base end diff --git a/test/rails/app-2.1.2/app/controllers/foo_controller.rb b/test/rails/app-2.1.2/app/controllers/foo_controller.rb index 8d877d1..52b7947 100644 --- a/test/rails/app-2.1.2/app/controllers/foo_controller.rb +++ b/test/rails/app-2.1.2/app/controllers/foo_controller.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + require 'digest/sha1' class FooController < ApplicationController def index diff --git a/test/rails/app-2.1.2/app/helpers/application_helper.rb b/test/rails/app-2.1.2/app/helpers/application_helper.rb index de6be79..d9889b3 100644 --- a/test/rails/app-2.1.2/app/helpers/application_helper.rb +++ b/test/rails/app-2.1.2/app/helpers/application_helper.rb @@ -1,2 +1,4 @@ +# -*- encoding: binary -*- + module ApplicationHelper end diff --git a/test/rails/app-2.1.2/config/boot.rb b/test/rails/app-2.1.2/config/boot.rb index 0a51688..e357f0a 100644 --- a/test/rails/app-2.1.2/config/boot.rb +++ b/test/rails/app-2.1.2/config/boot.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + # Don't change this file! # Configure your app in config/environment.rb and config/environments/*.rb diff --git a/test/rails/app-2.1.2/config/environment.rb b/test/rails/app-2.1.2/config/environment.rb index 7c720f6..9961f08 100644 --- a/test/rails/app-2.1.2/config/environment.rb +++ b/test/rails/app-2.1.2/config/environment.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + unless defined? RAILS_GEM_VERSION RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] end diff --git a/test/rails/app-2.1.2/config/environments/development.rb b/test/rails/app-2.1.2/config/environments/development.rb index 7f49032..37f523f 100644 --- a/test/rails/app-2.1.2/config/environments/development.rb +++ b/test/rails/app-2.1.2/config/environments/development.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = false config.whiny_nils = true config.action_controller.consider_all_requests_local = true diff --git a/test/rails/app-2.1.2/config/environments/production.rb b/test/rails/app-2.1.2/config/environments/production.rb index c4059e3..1e049b2 100644 --- a/test/rails/app-2.1.2/config/environments/production.rb +++ b/test/rails/app-2.1.2/config/environments/production.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = true config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true diff --git a/test/rails/app-2.1.2/config/routes.rb b/test/rails/app-2.1.2/config/routes.rb index 774028f..70816dc 100644 --- a/test/rails/app-2.1.2/config/routes.rb +++ b/test/rails/app-2.1.2/config/routes.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id.:format' map.connect ':controller/:action/:id' diff --git a/test/rails/app-2.2.2/app/controllers/application.rb b/test/rails/app-2.2.2/app/controllers/application.rb index 09705d1..e7bb740 100644 --- a/test/rails/app-2.2.2/app/controllers/application.rb +++ b/test/rails/app-2.2.2/app/controllers/application.rb @@ -1,2 +1,4 @@ +# -*- encoding: binary -*- + class ApplicationController < ActionController::Base end diff --git a/test/rails/app-2.2.2/app/controllers/foo_controller.rb b/test/rails/app-2.2.2/app/controllers/foo_controller.rb index 8d877d1..52b7947 100644 --- a/test/rails/app-2.2.2/app/controllers/foo_controller.rb +++ b/test/rails/app-2.2.2/app/controllers/foo_controller.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + require 'digest/sha1' class FooController < ApplicationController def index diff --git a/test/rails/app-2.2.2/app/helpers/application_helper.rb b/test/rails/app-2.2.2/app/helpers/application_helper.rb index de6be79..d9889b3 100644 --- a/test/rails/app-2.2.2/app/helpers/application_helper.rb +++ b/test/rails/app-2.2.2/app/helpers/application_helper.rb @@ -1,2 +1,4 @@ +# -*- encoding: binary -*- + module ApplicationHelper end diff --git a/test/rails/app-2.2.2/config/boot.rb b/test/rails/app-2.2.2/config/boot.rb index 0a51688..e357f0a 100644 --- a/test/rails/app-2.2.2/config/boot.rb +++ b/test/rails/app-2.2.2/config/boot.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + # Don't change this file! # Configure your app in config/environment.rb and config/environments/*.rb diff --git a/test/rails/app-2.2.2/config/environment.rb b/test/rails/app-2.2.2/config/environment.rb index 7c720f6..9961f08 100644 --- a/test/rails/app-2.2.2/config/environment.rb +++ b/test/rails/app-2.2.2/config/environment.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + unless defined? RAILS_GEM_VERSION RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] end diff --git a/test/rails/app-2.2.2/config/environments/development.rb b/test/rails/app-2.2.2/config/environments/development.rb index 7f49032..37f523f 100644 --- a/test/rails/app-2.2.2/config/environments/development.rb +++ b/test/rails/app-2.2.2/config/environments/development.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = false config.whiny_nils = true config.action_controller.consider_all_requests_local = true diff --git a/test/rails/app-2.2.2/config/environments/production.rb b/test/rails/app-2.2.2/config/environments/production.rb index c4059e3..1e049b2 100644 --- a/test/rails/app-2.2.2/config/environments/production.rb +++ b/test/rails/app-2.2.2/config/environments/production.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = true config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true diff --git a/test/rails/app-2.2.2/config/routes.rb b/test/rails/app-2.2.2/config/routes.rb index 774028f..70816dc 100644 --- a/test/rails/app-2.2.2/config/routes.rb +++ b/test/rails/app-2.2.2/config/routes.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id.:format' map.connect ':controller/:action/:id' diff --git a/test/rails/app-2.3.2.1/.gitignore b/test/rails/app-2.3.5/.gitignore index f451f91..f451f91 100644 --- a/test/rails/app-2.3.2.1/.gitignore +++ b/test/rails/app-2.3.5/.gitignore diff --git a/test/rails/app-2.3.2.1/Rakefile b/test/rails/app-2.3.5/Rakefile index fbebfca..fbebfca 100644 --- a/test/rails/app-2.3.2.1/Rakefile +++ b/test/rails/app-2.3.5/Rakefile diff --git a/test/rails/app-2.3.2.1/app/controllers/application_controller.rb b/test/rails/app-2.3.5/app/controllers/application_controller.rb index 6160f52..07c333e 100644 --- a/test/rails/app-2.3.2.1/app/controllers/application_controller.rb +++ b/test/rails/app-2.3.5/app/controllers/application_controller.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + class ApplicationController < ActionController::Base helper :all end diff --git a/test/rails/app-2.3.2.1/app/controllers/foo_controller.rb b/test/rails/app-2.3.5/app/controllers/foo_controller.rb index 261669c..54ca1ed 100644 --- a/test/rails/app-2.3.2.1/app/controllers/foo_controller.rb +++ b/test/rails/app-2.3.5/app/controllers/foo_controller.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + require 'digest/sha1' class FooController < ApplicationController def index diff --git a/test/rails/app-2.3.2.1/app/helpers/application_helper.rb b/test/rails/app-2.3.5/app/helpers/application_helper.rb index de6be79..d9889b3 100644 --- a/test/rails/app-2.3.2.1/app/helpers/application_helper.rb +++ b/test/rails/app-2.3.5/app/helpers/application_helper.rb @@ -1,2 +1,4 @@ +# -*- encoding: binary -*- + module ApplicationHelper end diff --git a/test/rails/app-2.3.2.1/config/boot.rb b/test/rails/app-2.3.5/config/boot.rb index d22e6b0..b6c80d5 100644 --- a/test/rails/app-2.3.2.1/config/boot.rb +++ b/test/rails/app-2.3.5/config/boot.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) module Rails diff --git a/test/rails/app-2.3.2.1/config/database.yml b/test/rails/app-2.3.5/config/database.yml index 9f77843..9f77843 100644 --- a/test/rails/app-2.3.2.1/config/database.yml +++ b/test/rails/app-2.3.5/config/database.yml diff --git a/test/rails/app-2.3.2.1/config/environment.rb b/test/rails/app-2.3.5/config/environment.rb index 17abdb7..6eb092c 100644 --- a/test/rails/app-2.3.2.1/config/environment.rb +++ b/test/rails/app-2.3.5/config/environment.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + unless defined? RAILS_GEM_VERSION RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] end diff --git a/test/rails/app-2.3.2.1/config/environments/development.rb b/test/rails/app-2.3.5/config/environments/development.rb index 55376c5..3d381d2 100644 --- a/test/rails/app-2.3.2.1/config/environments/development.rb +++ b/test/rails/app-2.3.5/config/environments/development.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = false config.whiny_nils = true config.action_controller.consider_all_requests_local = true diff --git a/test/rails/app-2.3.2.1/config/environments/production.rb b/test/rails/app-2.3.5/config/environments/production.rb index 474257d..08710a4 100644 --- a/test/rails/app-2.3.2.1/config/environments/production.rb +++ b/test/rails/app-2.3.5/config/environments/production.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + config.cache_classes = true config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true diff --git a/test/rails/app-2.3.2.1/config/routes.rb b/test/rails/app-2.3.5/config/routes.rb index 4248853..ac7877c 100644 --- a/test/rails/app-2.3.2.1/config/routes.rb +++ b/test/rails/app-2.3.5/config/routes.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' map.connect ':controller/:action/:id.:format' diff --git a/test/rails/app-2.3.2.1/db/.gitignore b/test/rails/app-2.3.5/db/.gitignore index e69de29..e69de29 100644 --- a/test/rails/app-2.3.2.1/db/.gitignore +++ b/test/rails/app-2.3.5/db/.gitignore diff --git a/test/rails/app-2.3.2.1/log/.gitignore b/test/rails/app-2.3.5/log/.gitignore index 397b4a7..397b4a7 100644 --- a/test/rails/app-2.3.2.1/log/.gitignore +++ b/test/rails/app-2.3.5/log/.gitignore diff --git a/test/rails/app-2.3.2.1/public/404.html b/test/rails/app-2.3.5/public/404.html index 44d986c..44d986c 100644 --- a/test/rails/app-2.3.2.1/public/404.html +++ b/test/rails/app-2.3.5/public/404.html diff --git a/test/rails/app-2.3.2.1/public/500.html b/test/rails/app-2.3.5/public/500.html index e534a49..e534a49 100644 --- a/test/rails/app-2.3.2.1/public/500.html +++ b/test/rails/app-2.3.5/public/500.html diff --git a/test/rails/app-2.3.5/public/x.txt b/test/rails/app-2.3.5/public/x.txt new file mode 100644 index 0000000..e427984 --- /dev/null +++ b/test/rails/app-2.3.5/public/x.txt @@ -0,0 +1 @@ +HELLO diff --git a/test/rails/test_rails.rb b/test/rails/test_rails.rb index c7add20..9502dcb 100644 --- a/test/rails/test_rails.rb +++ b/test/rails/test_rails.rb @@ -1,3 +1,5 @@ +# -*- encoding: binary -*- + # Copyright (c) 2009 Eric Wong require 'test/test_helper' @@ -142,18 +144,24 @@ logger Logger.new('#{COMMON_TMP.path}') end end end - resp = `curl -isSfN -Ffile=@#{tmp.path} http://#@addr:#@port/foo/xpost` - assert $?.success? - resp = resp.split(/\r?\n/) - grepped = resp.grep(/^sha1: (.{40})/) - assert_equal 1, grepped.size - assert_equal(sha1.hexdigest, /^sha1: (.{40})/.match(grepped.first)[1]) - - grepped = resp.grep(/^Content-Type:\s+(.+)/i) - assert_equal 1, grepped.size - assert_match %r{^text/plain}, grepped.first.split(/\s*:\s*/)[1] - assert_equal 1, resp.grep(/^Status:/i).size + # fixed in Rack commit 44ed4640f077504a49b7f1cabf8d6ad7a13f6441, + # no released version of Rails or Rack has this fix + if RB_V[0] >= 1 && RB_V[1] >= 9 + warn "multipart broken with Rack 1.0.0 and Rails 2.3.2.1 under 1.9" + else + resp = `curl -isSfN -Ffile=@#{tmp.path} http://#@addr:#@port/foo/xpost` + assert $?.success? + resp = resp.split(/\r?\n/) + grepped = resp.grep(/^sha1: (.{40})/) + assert_equal 1, grepped.size + assert_equal(sha1.hexdigest, /^sha1: (.{40})/.match(grepped.first)[1]) + + grepped = resp.grep(/^Content-Type:\s+(.+)/i) + assert_equal 1, grepped.size + assert_match %r{^text/plain}, grepped.first.split(/\s*:\s*/)[1] + assert_equal 1, resp.grep(/^Status:/i).size + end # make sure we can get 403 responses, too uri = URI.parse("http://#@addr:#@port/foo/xpost") @@ -223,6 +231,31 @@ logger Logger.new('#{COMMON_TMP.path}') assert_equal '404 Not Found', res['Status'] end + def test_alt_url_root_config_env + # cbf to actually work on this since I never use this feature (ewong) + return unless ROR_V[0] >= 2 && ROR_V[1] >= 3 + tmp = Tempfile.new(nil) + tmp.syswrite("ENV['RAILS_RELATIVE_URL_ROOT'] = '/poo'\n") + redirect_test_io do + @pid = fork { exec 'unicorn_rails', "-l#@addr:#@port", "-c", tmp.path } + end + wait_master_ready("test_stderr.#$$.log") + res = Net::HTTP.get_response(URI.parse("http://#@addr:#@port/poo/foo")) + assert_equal "200", res.code + assert_equal '200 OK', res['Status'] + assert_equal "FOO\n", res.body + assert_match %r{^text/html\b}, res['Content-Type'] + assert_equal "4", res['Content-Length'] + + res = Net::HTTP.get_response(URI.parse("http://#@addr:#@port/foo")) + assert_equal "404", res.code + assert_equal '404 Not Found', res['Status'] + + res = Net::HTTP.get_response(URI.parse("http://#@addr:#@port/poo/x.txt")) + assert_equal "200", res.code + assert_equal "HELLO\n", res.body + end + def teardown return if @start_pid != $$ |