From fefbed6c37e1b8b4213a7b8fe8ecc58809ebc05d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 20 Jul 2009 12:09:41 -0700 Subject: Update Rails tests to run on Rails 2.3.3.1 --- test/rails/app-2.3.2.1/.gitignore | 2 - test/rails/app-2.3.2.1/Rakefile | 7 -- .../app/controllers/application_controller.rb | 3 - .../app-2.3.2.1/app/controllers/foo_controller.rb | 34 ------- .../app-2.3.2.1/app/helpers/application_helper.rb | 2 - test/rails/app-2.3.2.1/config/boot.rb | 107 --------------------- test/rails/app-2.3.2.1/config/database.yml | 12 --- test/rails/app-2.3.2.1/config/environment.rb | 15 --- .../app-2.3.2.1/config/environments/development.rb | 5 - .../app-2.3.2.1/config/environments/production.rb | 4 - test/rails/app-2.3.2.1/config/routes.rb | 4 - test/rails/app-2.3.2.1/db/.gitignore | 0 test/rails/app-2.3.2.1/log/.gitignore | 1 - test/rails/app-2.3.2.1/public/404.html | 1 - test/rails/app-2.3.2.1/public/500.html | 1 - test/rails/app-2.3.3.1/.gitignore | 2 + test/rails/app-2.3.3.1/Rakefile | 7 ++ .../app/controllers/application_controller.rb | 3 + .../app-2.3.3.1/app/controllers/foo_controller.rb | 34 +++++++ .../app-2.3.3.1/app/helpers/application_helper.rb | 2 + test/rails/app-2.3.3.1/config/boot.rb | 107 +++++++++++++++++++++ test/rails/app-2.3.3.1/config/database.yml | 12 +++ test/rails/app-2.3.3.1/config/environment.rb | 15 +++ .../app-2.3.3.1/config/environments/development.rb | 5 + .../app-2.3.3.1/config/environments/production.rb | 4 + test/rails/app-2.3.3.1/config/routes.rb | 4 + test/rails/app-2.3.3.1/db/.gitignore | 0 test/rails/app-2.3.3.1/log/.gitignore | 1 + test/rails/app-2.3.3.1/public/404.html | 1 + test/rails/app-2.3.3.1/public/500.html | 1 + 30 files changed, 198 insertions(+), 198 deletions(-) delete mode 100644 test/rails/app-2.3.2.1/.gitignore delete mode 100644 test/rails/app-2.3.2.1/Rakefile delete mode 100644 test/rails/app-2.3.2.1/app/controllers/application_controller.rb delete mode 100644 test/rails/app-2.3.2.1/app/controllers/foo_controller.rb delete mode 100644 test/rails/app-2.3.2.1/app/helpers/application_helper.rb delete mode 100644 test/rails/app-2.3.2.1/config/boot.rb delete mode 100644 test/rails/app-2.3.2.1/config/database.yml delete mode 100644 test/rails/app-2.3.2.1/config/environment.rb delete mode 100644 test/rails/app-2.3.2.1/config/environments/development.rb delete mode 100644 test/rails/app-2.3.2.1/config/environments/production.rb delete mode 100644 test/rails/app-2.3.2.1/config/routes.rb delete mode 100644 test/rails/app-2.3.2.1/db/.gitignore delete mode 100644 test/rails/app-2.3.2.1/log/.gitignore delete mode 100644 test/rails/app-2.3.2.1/public/404.html delete mode 100644 test/rails/app-2.3.2.1/public/500.html create mode 100644 test/rails/app-2.3.3.1/.gitignore create mode 100644 test/rails/app-2.3.3.1/Rakefile create mode 100644 test/rails/app-2.3.3.1/app/controllers/application_controller.rb create mode 100644 test/rails/app-2.3.3.1/app/controllers/foo_controller.rb create mode 100644 test/rails/app-2.3.3.1/app/helpers/application_helper.rb create mode 100644 test/rails/app-2.3.3.1/config/boot.rb create mode 100644 test/rails/app-2.3.3.1/config/database.yml create mode 100644 test/rails/app-2.3.3.1/config/environment.rb create mode 100644 test/rails/app-2.3.3.1/config/environments/development.rb create mode 100644 test/rails/app-2.3.3.1/config/environments/production.rb create mode 100644 test/rails/app-2.3.3.1/config/routes.rb create mode 100644 test/rails/app-2.3.3.1/db/.gitignore create mode 100644 test/rails/app-2.3.3.1/log/.gitignore create mode 100644 test/rails/app-2.3.3.1/public/404.html create mode 100644 test/rails/app-2.3.3.1/public/500.html (limited to 'test') diff --git a/test/rails/app-2.3.2.1/.gitignore b/test/rails/app-2.3.2.1/.gitignore deleted file mode 100644 index f451f91..0000000 --- a/test/rails/app-2.3.2.1/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/tmp -/vendor diff --git a/test/rails/app-2.3.2.1/Rakefile b/test/rails/app-2.3.2.1/Rakefile deleted file mode 100644 index fbebfca..0000000 --- a/test/rails/app-2.3.2.1/Rakefile +++ /dev/null @@ -1,7 +0,0 @@ -require(File.join(File.dirname(__FILE__), 'config', 'boot')) - -require 'rake' -require 'rake/testtask' -require 'rake/rdoctask' - -require 'tasks/rails' diff --git a/test/rails/app-2.3.2.1/app/controllers/application_controller.rb b/test/rails/app-2.3.2.1/app/controllers/application_controller.rb deleted file mode 100644 index 6160f52..0000000 --- a/test/rails/app-2.3.2.1/app/controllers/application_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -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.2.1/app/controllers/foo_controller.rb deleted file mode 100644 index 261669c..0000000 --- a/test/rails/app-2.3.2.1/app/controllers/foo_controller.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'digest/sha1' -class FooController < ApplicationController - def index - render :text => "FOO\n" - end - - def xcookie - cookies["foo"] = "cookie-#$$-#{session[:gotta_use_the_session_in_2_3]}" - render :text => "" - end - - def xnotice - flash[:notice] = "session #$$" - render :text => "" - end - - def xpost - if request.post? - digest = Digest::SHA1.new - out = "params: #{params.inspect}\n" - if file = params[:file] - loop do - buf = file.read(4096) or break - digest.update(buf) - end - out << "sha1: #{digest.to_s}\n" - end - headers['content-type'] = 'text/plain' - render :text => out - else - render :status => 403, :text => "need post\n" - end - end -end diff --git a/test/rails/app-2.3.2.1/app/helpers/application_helper.rb b/test/rails/app-2.3.2.1/app/helpers/application_helper.rb deleted file mode 100644 index de6be79..0000000 --- a/test/rails/app-2.3.2.1/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/test/rails/app-2.3.2.1/config/boot.rb b/test/rails/app-2.3.2.1/config/boot.rb deleted file mode 100644 index d22e6b0..0000000 --- a/test/rails/app-2.3.2.1/config/boot.rb +++ /dev/null @@ -1,107 +0,0 @@ -RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) - -module Rails - class << self - def boot! - unless booted? - preinitialize - pick_boot.run - end - end - - def booted? - defined? Rails::Initializer - end - - def pick_boot - (vendor_rails? ? VendorBoot : GemBoot).new - end - - def vendor_rails? - File.exist?("#{RAILS_ROOT}/vendor/rails") - end - - def preinitialize - load(preinitializer_path) if File.exist?(preinitializer_path) - end - - def preinitializer_path - "#{RAILS_ROOT}/config/preinitializer.rb" - end - end - - class Boot - def run - load_initializer - Rails::Initializer.run(:set_load_path) - end - end - - class VendorBoot < Boot - def load_initializer - require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" - Rails::Initializer.run(:install_gem_spec_stubs) - Rails::GemDependency.add_frozen_gem_path - end - end - - class GemBoot < Boot - def load_initializer - self.class.load_rubygems - load_rails_gem - require 'initializer' - end - - def load_rails_gem - if version = self.class.gem_version - gem 'rails', version - else - gem 'rails' - end - rescue Gem::LoadError => load_error - $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.) - exit 1 - end - - class << self - def rubygems_version - Gem::RubyGemsVersion rescue nil - end - - def gem_version - if defined? RAILS_GEM_VERSION - RAILS_GEM_VERSION - elsif ENV.include?('RAILS_GEM_VERSION') - ENV['RAILS_GEM_VERSION'] - else - parse_gem_version(read_environment_rb) - end - end - - def load_rubygems - require 'rubygems' - min_version = '1.3.1' - unless rubygems_version >= min_version - $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.) - exit 1 - end - - rescue LoadError - $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org) - exit 1 - end - - def parse_gem_version(text) - $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/ - end - - private - def read_environment_rb - File.read("#{RAILS_ROOT}/config/environment.rb") - end - end - end -end - -# All that for this: -Rails.boot! diff --git a/test/rails/app-2.3.2.1/config/database.yml b/test/rails/app-2.3.2.1/config/database.yml deleted file mode 100644 index 9f77843..0000000 --- a/test/rails/app-2.3.2.1/config/database.yml +++ /dev/null @@ -1,12 +0,0 @@ -development: - adapter: sqlite3 - database: db/development.sqlite3 - timeout: 5000 -test: - adapter: sqlite3 - database: db/test.sqlite3 - timeout: 5000 -production: - adapter: sqlite3 - database: db/production.sqlite3 - timeout: 5000 diff --git a/test/rails/app-2.3.2.1/config/environment.rb b/test/rails/app-2.3.2.1/config/environment.rb deleted file mode 100644 index 17abdb7..0000000 --- a/test/rails/app-2.3.2.1/config/environment.rb +++ /dev/null @@ -1,15 +0,0 @@ -unless defined? RAILS_GEM_VERSION - RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] -end - -# Bootstrap the Rails environment, frameworks, and default configuration -require File.join(File.dirname(__FILE__), 'boot') - -Rails::Initializer.run do |config| - config.frameworks -= [ :active_resource, :action_mailer ] - config.action_controller.session_store = :active_record_store - config.action_controller.session = { - :session_key => "_unicorn_rails_test.#{rand}", - :secret => "#{rand}#{rand}#{rand}#{rand}", - } -end diff --git a/test/rails/app-2.3.2.1/config/environments/development.rb b/test/rails/app-2.3.2.1/config/environments/development.rb deleted file mode 100644 index 55376c5..0000000 --- a/test/rails/app-2.3.2.1/config/environments/development.rb +++ /dev/null @@ -1,5 +0,0 @@ -config.cache_classes = false -config.whiny_nils = true -config.action_controller.consider_all_requests_local = true -config.action_view.debug_rjs = true -config.action_controller.perform_caching = false diff --git a/test/rails/app-2.3.2.1/config/environments/production.rb b/test/rails/app-2.3.2.1/config/environments/production.rb deleted file mode 100644 index 474257d..0000000 --- a/test/rails/app-2.3.2.1/config/environments/production.rb +++ /dev/null @@ -1,4 +0,0 @@ -config.cache_classes = true -config.action_controller.consider_all_requests_local = false -config.action_controller.perform_caching = true -config.action_view.cache_template_loading = true diff --git a/test/rails/app-2.3.2.1/config/routes.rb b/test/rails/app-2.3.2.1/config/routes.rb deleted file mode 100644 index 4248853..0000000 --- a/test/rails/app-2.3.2.1/config/routes.rb +++ /dev/null @@ -1,4 +0,0 @@ -ActionController::Routing::Routes.draw do |map| - map.connect ':controller/:action/:id' - map.connect ':controller/:action/:id.:format' -end diff --git a/test/rails/app-2.3.2.1/db/.gitignore b/test/rails/app-2.3.2.1/db/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/test/rails/app-2.3.2.1/log/.gitignore b/test/rails/app-2.3.2.1/log/.gitignore deleted file mode 100644 index 397b4a7..0000000 --- a/test/rails/app-2.3.2.1/log/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.log diff --git a/test/rails/app-2.3.2.1/public/404.html b/test/rails/app-2.3.2.1/public/404.html deleted file mode 100644 index 44d986c..0000000 --- a/test/rails/app-2.3.2.1/public/404.html +++ /dev/null @@ -1 +0,0 @@ -404 Not Found diff --git a/test/rails/app-2.3.2.1/public/500.html b/test/rails/app-2.3.2.1/public/500.html deleted file mode 100644 index e534a49..0000000 --- a/test/rails/app-2.3.2.1/public/500.html +++ /dev/null @@ -1 +0,0 @@ -500 Internal Server Error diff --git a/test/rails/app-2.3.3.1/.gitignore b/test/rails/app-2.3.3.1/.gitignore new file mode 100644 index 0000000..f451f91 --- /dev/null +++ b/test/rails/app-2.3.3.1/.gitignore @@ -0,0 +1,2 @@ +/tmp +/vendor diff --git a/test/rails/app-2.3.3.1/Rakefile b/test/rails/app-2.3.3.1/Rakefile new file mode 100644 index 0000000..fbebfca --- /dev/null +++ b/test/rails/app-2.3.3.1/Rakefile @@ -0,0 +1,7 @@ +require(File.join(File.dirname(__FILE__), 'config', 'boot')) + +require 'rake' +require 'rake/testtask' +require 'rake/rdoctask' + +require 'tasks/rails' diff --git a/test/rails/app-2.3.3.1/app/controllers/application_controller.rb b/test/rails/app-2.3.3.1/app/controllers/application_controller.rb new file mode 100644 index 0000000..6160f52 --- /dev/null +++ b/test/rails/app-2.3.3.1/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + helper :all +end diff --git a/test/rails/app-2.3.3.1/app/controllers/foo_controller.rb b/test/rails/app-2.3.3.1/app/controllers/foo_controller.rb new file mode 100644 index 0000000..261669c --- /dev/null +++ b/test/rails/app-2.3.3.1/app/controllers/foo_controller.rb @@ -0,0 +1,34 @@ +require 'digest/sha1' +class FooController < ApplicationController + def index + render :text => "FOO\n" + end + + def xcookie + cookies["foo"] = "cookie-#$$-#{session[:gotta_use_the_session_in_2_3]}" + render :text => "" + end + + def xnotice + flash[:notice] = "session #$$" + render :text => "" + end + + def xpost + if request.post? + digest = Digest::SHA1.new + out = "params: #{params.inspect}\n" + if file = params[:file] + loop do + buf = file.read(4096) or break + digest.update(buf) + end + out << "sha1: #{digest.to_s}\n" + end + headers['content-type'] = 'text/plain' + render :text => out + else + render :status => 403, :text => "need post\n" + end + end +end diff --git a/test/rails/app-2.3.3.1/app/helpers/application_helper.rb b/test/rails/app-2.3.3.1/app/helpers/application_helper.rb new file mode 100644 index 0000000..de6be79 --- /dev/null +++ b/test/rails/app-2.3.3.1/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/test/rails/app-2.3.3.1/config/boot.rb b/test/rails/app-2.3.3.1/config/boot.rb new file mode 100644 index 0000000..d22e6b0 --- /dev/null +++ b/test/rails/app-2.3.3.1/config/boot.rb @@ -0,0 +1,107 @@ +RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) + +module Rails + class << self + def boot! + unless booted? + preinitialize + pick_boot.run + end + end + + def booted? + defined? Rails::Initializer + end + + def pick_boot + (vendor_rails? ? VendorBoot : GemBoot).new + end + + def vendor_rails? + File.exist?("#{RAILS_ROOT}/vendor/rails") + end + + def preinitialize + load(preinitializer_path) if File.exist?(preinitializer_path) + end + + def preinitializer_path + "#{RAILS_ROOT}/config/preinitializer.rb" + end + end + + class Boot + def run + load_initializer + Rails::Initializer.run(:set_load_path) + end + end + + class VendorBoot < Boot + def load_initializer + require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" + Rails::Initializer.run(:install_gem_spec_stubs) + Rails::GemDependency.add_frozen_gem_path + end + end + + class GemBoot < Boot + def load_initializer + self.class.load_rubygems + load_rails_gem + require 'initializer' + end + + def load_rails_gem + if version = self.class.gem_version + gem 'rails', version + else + gem 'rails' + end + rescue Gem::LoadError => load_error + $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.) + exit 1 + end + + class << self + def rubygems_version + Gem::RubyGemsVersion rescue nil + end + + def gem_version + if defined? RAILS_GEM_VERSION + RAILS_GEM_VERSION + elsif ENV.include?('RAILS_GEM_VERSION') + ENV['RAILS_GEM_VERSION'] + else + parse_gem_version(read_environment_rb) + end + end + + def load_rubygems + require 'rubygems' + min_version = '1.3.1' + unless rubygems_version >= min_version + $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.) + exit 1 + end + + rescue LoadError + $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org) + exit 1 + end + + def parse_gem_version(text) + $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/ + end + + private + def read_environment_rb + File.read("#{RAILS_ROOT}/config/environment.rb") + end + end + end +end + +# All that for this: +Rails.boot! diff --git a/test/rails/app-2.3.3.1/config/database.yml b/test/rails/app-2.3.3.1/config/database.yml new file mode 100644 index 0000000..9f77843 --- /dev/null +++ b/test/rails/app-2.3.3.1/config/database.yml @@ -0,0 +1,12 @@ +development: + adapter: sqlite3 + database: db/development.sqlite3 + timeout: 5000 +test: + adapter: sqlite3 + database: db/test.sqlite3 + timeout: 5000 +production: + adapter: sqlite3 + database: db/production.sqlite3 + timeout: 5000 diff --git a/test/rails/app-2.3.3.1/config/environment.rb b/test/rails/app-2.3.3.1/config/environment.rb new file mode 100644 index 0000000..17abdb7 --- /dev/null +++ b/test/rails/app-2.3.3.1/config/environment.rb @@ -0,0 +1,15 @@ +unless defined? RAILS_GEM_VERSION + RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] +end + +# Bootstrap the Rails environment, frameworks, and default configuration +require File.join(File.dirname(__FILE__), 'boot') + +Rails::Initializer.run do |config| + config.frameworks -= [ :active_resource, :action_mailer ] + config.action_controller.session_store = :active_record_store + config.action_controller.session = { + :session_key => "_unicorn_rails_test.#{rand}", + :secret => "#{rand}#{rand}#{rand}#{rand}", + } +end diff --git a/test/rails/app-2.3.3.1/config/environments/development.rb b/test/rails/app-2.3.3.1/config/environments/development.rb new file mode 100644 index 0000000..55376c5 --- /dev/null +++ b/test/rails/app-2.3.3.1/config/environments/development.rb @@ -0,0 +1,5 @@ +config.cache_classes = false +config.whiny_nils = true +config.action_controller.consider_all_requests_local = true +config.action_view.debug_rjs = true +config.action_controller.perform_caching = false diff --git a/test/rails/app-2.3.3.1/config/environments/production.rb b/test/rails/app-2.3.3.1/config/environments/production.rb new file mode 100644 index 0000000..474257d --- /dev/null +++ b/test/rails/app-2.3.3.1/config/environments/production.rb @@ -0,0 +1,4 @@ +config.cache_classes = true +config.action_controller.consider_all_requests_local = false +config.action_controller.perform_caching = true +config.action_view.cache_template_loading = true diff --git a/test/rails/app-2.3.3.1/config/routes.rb b/test/rails/app-2.3.3.1/config/routes.rb new file mode 100644 index 0000000..4248853 --- /dev/null +++ b/test/rails/app-2.3.3.1/config/routes.rb @@ -0,0 +1,4 @@ +ActionController::Routing::Routes.draw do |map| + map.connect ':controller/:action/:id' + map.connect ':controller/:action/:id.:format' +end diff --git a/test/rails/app-2.3.3.1/db/.gitignore b/test/rails/app-2.3.3.1/db/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/test/rails/app-2.3.3.1/log/.gitignore b/test/rails/app-2.3.3.1/log/.gitignore new file mode 100644 index 0000000..397b4a7 --- /dev/null +++ b/test/rails/app-2.3.3.1/log/.gitignore @@ -0,0 +1 @@ +*.log diff --git a/test/rails/app-2.3.3.1/public/404.html b/test/rails/app-2.3.3.1/public/404.html new file mode 100644 index 0000000..44d986c --- /dev/null +++ b/test/rails/app-2.3.3.1/public/404.html @@ -0,0 +1 @@ +404 Not Found diff --git a/test/rails/app-2.3.3.1/public/500.html b/test/rails/app-2.3.3.1/public/500.html new file mode 100644 index 0000000..e534a49 --- /dev/null +++ b/test/rails/app-2.3.3.1/public/500.html @@ -0,0 +1 @@ +500 Internal Server Error -- cgit v1.2.3-24-ge0c7