From 91a3cde091d4ae6ff436681f155b3907daae1c04 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 26 Jul 2012 23:44:04 +0000 Subject: remove Rails-oriented integration tests It's too much overhead to keep Rails-specific tests working, especially when it's hauling in an ancient version of SQLite3. Since Rails 3 has settled down with Rack and unicorn_rails is unlikely to need changing in the future, we can drop these tests. --- t/rails3-app/.gitignore | 4 -- t/rails3-app/Gemfile | 26 ---------- t/rails3-app/Rakefile | 10 ---- .../app/controllers/application_controller.rb | 4 -- t/rails3-app/app/helpers/application_helper.rb | 2 - .../app/views/layouts/application.html.erb | 14 ------ t/rails3-app/config.ru | 4 -- t/rails3-app/config/application.rb | 46 ----------------- t/rails3-app/config/boot.rb | 6 --- t/rails3-app/config/database.yml | 22 -------- t/rails3-app/config/environment.rb | 5 -- t/rails3-app/config/environments/development.rb | 19 ------- t/rails3-app/config/environments/production.rb | 42 ---------------- t/rails3-app/config/environments/test.rb | 32 ------------ .../config/initializers/backtrace_silencers.rb | 7 --- t/rails3-app/config/initializers/inflections.rb | 10 ---- t/rails3-app/config/initializers/mime_types.rb | 5 -- t/rails3-app/config/initializers/secret_token.rb | 7 --- t/rails3-app/config/initializers/session_store.rb | 8 --- t/rails3-app/config/locales/en.yml | 5 -- t/rails3-app/config/routes.rb | 58 ---------------------- t/rails3-app/db/seeds.rb | 7 --- t/rails3-app/doc/README_FOR_APP | 2 - t/rails3-app/lib/tasks/.gitkeep | 0 t/rails3-app/public/404.html | 1 - t/rails3-app/public/500.html | 1 - t/rails3-app/public/x.txt | 1 - t/rails3-app/script/rails | 9 ---- t/rails3-app/test/performance/browsing_test.rb | 9 ---- t/rails3-app/test/test_helper.rb | 13 ----- t/rails3-app/vendor/plugins/.gitkeep | 0 t/t0300-rails3-basic.sh | 28 ----------- t/t0301-rails3-missing-config-ru.sh | 33 ------------ t/t0302-rails3-alt-working_directory.sh | 32 ------------ t/t0303-rails3-alt-working_directory_config.ru.sh | 56 --------------------- ...04-rails3-alt-working_directory_no_embed_cli.sh | 52 ------------------- t/test-rails3.sh | 27 ---------- 37 files changed, 607 deletions(-) delete mode 100644 t/rails3-app/.gitignore delete mode 100644 t/rails3-app/Gemfile delete mode 100644 t/rails3-app/Rakefile delete mode 100644 t/rails3-app/app/controllers/application_controller.rb delete mode 100644 t/rails3-app/app/helpers/application_helper.rb delete mode 100644 t/rails3-app/app/views/layouts/application.html.erb delete mode 100644 t/rails3-app/config.ru delete mode 100644 t/rails3-app/config/application.rb delete mode 100644 t/rails3-app/config/boot.rb delete mode 100644 t/rails3-app/config/database.yml delete mode 100644 t/rails3-app/config/environment.rb delete mode 100644 t/rails3-app/config/environments/development.rb delete mode 100644 t/rails3-app/config/environments/production.rb delete mode 100644 t/rails3-app/config/environments/test.rb delete mode 100644 t/rails3-app/config/initializers/backtrace_silencers.rb delete mode 100644 t/rails3-app/config/initializers/inflections.rb delete mode 100644 t/rails3-app/config/initializers/mime_types.rb delete mode 100644 t/rails3-app/config/initializers/secret_token.rb delete mode 100644 t/rails3-app/config/initializers/session_store.rb delete mode 100644 t/rails3-app/config/locales/en.yml delete mode 100644 t/rails3-app/config/routes.rb delete mode 100644 t/rails3-app/db/seeds.rb delete mode 100644 t/rails3-app/doc/README_FOR_APP delete mode 100644 t/rails3-app/lib/tasks/.gitkeep delete mode 100644 t/rails3-app/public/404.html delete mode 100644 t/rails3-app/public/500.html delete mode 100644 t/rails3-app/public/x.txt delete mode 100755 t/rails3-app/script/rails delete mode 100644 t/rails3-app/test/performance/browsing_test.rb delete mode 100644 t/rails3-app/test/test_helper.rb delete mode 100644 t/rails3-app/vendor/plugins/.gitkeep delete mode 100755 t/t0300-rails3-basic.sh delete mode 100755 t/t0301-rails3-missing-config-ru.sh delete mode 100755 t/t0302-rails3-alt-working_directory.sh delete mode 100755 t/t0303-rails3-alt-working_directory_config.ru.sh delete mode 100755 t/t0304-rails3-alt-working_directory_no_embed_cli.sh delete mode 100644 t/test-rails3.sh (limited to 't') diff --git a/t/rails3-app/.gitignore b/t/rails3-app/.gitignore deleted file mode 100644 index af64fae..0000000 --- a/t/rails3-app/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.bundle -db/*.sqlite3 -log/*.log -tmp/**/* diff --git a/t/rails3-app/Gemfile b/t/rails3-app/Gemfile deleted file mode 100644 index d996f34..0000000 --- a/t/rails3-app/Gemfile +++ /dev/null @@ -1,26 +0,0 @@ -source 'http://rubygems.org' - -# gem 'rails', '3.0.0' - -# Bundle edge Rails instead: -# gem 'rails', :git => 'git://github.com/rails/rails.git' - -# gem 'sqlite3-ruby', :require => 'sqlite3' - -# Use unicorn as the web server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -# Bundle the extra gems: -# gem 'bj' -# gem 'nokogiri', '1.4.1' -# gem 'sqlite3-ruby', :require => 'sqlite3' -# gem 'aws-s3', :require => 'aws/s3' - -# Bundle gems for certain environments: -# gem 'rspec', :group => :test -# group :test do -# gem 'webrat' -# end diff --git a/t/rails3-app/Rakefile b/t/rails3-app/Rakefile deleted file mode 100644 index 9cb2046..0000000 --- a/t/rails3-app/Rakefile +++ /dev/null @@ -1,10 +0,0 @@ -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require File.expand_path('../config/application', __FILE__) - -require 'rake' -require 'rake/testtask' -require 'rake/rdoctask' - -Rails::Application.load_tasks diff --git a/t/rails3-app/app/controllers/application_controller.rb b/t/rails3-app/app/controllers/application_controller.rb deleted file mode 100644 index f2569b3..0000000 --- a/t/rails3-app/app/controllers/application_controller.rb +++ /dev/null @@ -1,4 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery - layout 'application' -end diff --git a/t/rails3-app/app/helpers/application_helper.rb b/t/rails3-app/app/helpers/application_helper.rb deleted file mode 100644 index de6be79..0000000 --- a/t/rails3-app/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/t/rails3-app/app/views/layouts/application.html.erb b/t/rails3-app/app/views/layouts/application.html.erb deleted file mode 100644 index 89179cb..0000000 --- a/t/rails3-app/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - App - <%= stylesheet_link_tag :all %> - <%= javascript_include_tag :defaults %> - <%= csrf_meta_tag %> - - - -<%= yield %> - - - diff --git a/t/rails3-app/config.ru b/t/rails3-app/config.ru deleted file mode 100644 index 48c8ee3..0000000 --- a/t/rails3-app/config.ru +++ /dev/null @@ -1,4 +0,0 @@ -# This file is used by Rack-based servers to start the application. - -require ::File.expand_path('../config/environment', __FILE__) -run App::Application diff --git a/t/rails3-app/config/application.rb b/t/rails3-app/config/application.rb deleted file mode 100644 index f970176..0000000 --- a/t/rails3-app/config/application.rb +++ /dev/null @@ -1,46 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require 'rails/all' - -# If you have a Gemfile, require the gems listed there, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) if defined?(Bundler) - -module App - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{config.root}/extras ) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - - # Configure generators values. Many other options are available, be sure to check the documentation. - # config.generators do |g| - # g.orm :active_record - # g.template_engine :erb - # g.test_framework :test_unit, :fixture => true - # end - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - end -end diff --git a/t/rails3-app/config/boot.rb b/t/rails3-app/config/boot.rb deleted file mode 100644 index 712b098..0000000 --- a/t/rails3-app/config/boot.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rubygems' -# Set up gems listed in the Gemfile. -if File.exist?(File.expand_path('../../Gemfile', __FILE__)) - require 'bundler' - Bundler.setup -end diff --git a/t/rails3-app/config/database.yml b/t/rails3-app/config/database.yml deleted file mode 100644 index 025d62a..0000000 --- a/t/rails3-app/config/database.yml +++ /dev/null @@ -1,22 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3-ruby (not necessary on OS X Leopard) -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 diff --git a/t/rails3-app/config/environment.rb b/t/rails3-app/config/environment.rb deleted file mode 100644 index df5d4fb..0000000 --- a/t/rails3-app/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the rails application -require File.expand_path('../application', __FILE__) - -# Initialize the rails application -App::Application.initialize! diff --git a/t/rails3-app/config/environments/development.rb b/t/rails3-app/config/environments/development.rb deleted file mode 100644 index c00c9a5..0000000 --- a/t/rails3-app/config/environments/development.rb +++ /dev/null @@ -1,19 +0,0 @@ -App::Application.configure do - # Settings specified here will take precedence over those in config/environment.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the webserver when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_view.debug_rjs = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false -end diff --git a/t/rails3-app/config/environments/production.rb b/t/rails3-app/config/environments/production.rb deleted file mode 100644 index 8ee2d35..0000000 --- a/t/rails3-app/config/environments/production.rb +++ /dev/null @@ -1,42 +0,0 @@ -App::Application.configure do - # Settings specified here will take precedence over those in config/environment.rb - - # The production environment is meant for finished, "live" apps. - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Specifies the header that your server uses for sending files - config.action_dispatch.x_sendfile_header = "X-Sendfile" - - # For nginx: - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' - - # If you have no front-end server that supports something like X-Sendfile, - # just comment this out and Rails will serve the files - - # See everything in the log (default is :info) - # config.log_level = :debug - - # Use a different logger for distributed setups - # config.logger = SyslogLogger.new - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Disable Rails's static asset server - # In production, Apache or nginx will already do this - config.serve_static_assets = false - - # Enable serving of images, stylesheets, and javascripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! -end diff --git a/t/rails3-app/config/environments/test.rb b/t/rails3-app/config/environments/test.rb deleted file mode 100644 index 06816bc..0000000 --- a/t/rails3-app/config/environments/test.rb +++ /dev/null @@ -1,32 +0,0 @@ -App::Application.configure do - # Settings specified here will take precedence over those in config/environment.rb - - # The test environment is used exclusively to run your application's - # test suite. You never need to work with it otherwise. Remember that - # your test database is "scratch space" for the test suite and is wiped - # and recreated between test runs. Don't rely on the data there! - config.cache_classes = true - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Raise exceptions instead of rendering exception templates - config.action_dispatch.show_exceptions = false - - # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql -end diff --git a/t/rails3-app/config/initializers/backtrace_silencers.rb b/t/rails3-app/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cd..0000000 --- a/t/rails3-app/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/t/rails3-app/config/initializers/inflections.rb b/t/rails3-app/config/initializers/inflections.rb deleted file mode 100644 index 9e8b013..0000000 --- a/t/rails3-app/config/initializers/inflections.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end diff --git a/t/rails3-app/config/initializers/mime_types.rb b/t/rails3-app/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e..0000000 --- a/t/rails3-app/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/t/rails3-app/config/initializers/secret_token.rb b/t/rails3-app/config/initializers/secret_token.rb deleted file mode 100644 index 2d38cf9..0000000 --- a/t/rails3-app/config/initializers/secret_token.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -Rails.application.config.secret_token = '71ca844cc99ed2057a65cc6bd66b57fbbf69e8d4aef00072e41c3e896635e99ea485a6ed45f6e846d5547d614235df146a9756920b8b4a1726a53e75cda45bd1' diff --git a/t/rails3-app/config/initializers/session_store.rb b/t/rails3-app/config/initializers/session_store.rb deleted file mode 100644 index 845cb69..0000000 --- a/t/rails3-app/config/initializers/session_store.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Rails.application.config.session_store :cookie_store, :key => '_app_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rake db:sessions:create") -# Rails.application.config.session_store :active_record_store diff --git a/t/rails3-app/config/locales/en.yml b/t/rails3-app/config/locales/en.yml deleted file mode 100644 index a747bfa..0000000 --- a/t/rails3-app/config/locales/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - hello: "Hello world" diff --git a/t/rails3-app/config/routes.rb b/t/rails3-app/config/routes.rb deleted file mode 100644 index 03e3c23..0000000 --- a/t/rails3-app/config/routes.rb +++ /dev/null @@ -1,58 +0,0 @@ -App::Application.routes.draw do |map| - # The priority is based upon order of creation: - # first created -> highest priority. - - # Sample of regular route: - # match 'products/:id' => 'catalog#view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Sample resource route with options: - # resources :products do - # member do - # get :short - # post :toggle - # end - # - # collection do - # get :sold - # end - # end - - # Sample resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Sample resource route with more complex sub-resources - # resources :products do - # resources :comments - # resources :sales do - # get :recent, :on => :collection - # end - # end - - # Sample resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end - - # You can have the root of your site routed with "root" - # just remember to delete public/index.html. - # root :to => "welcome#index" - - # See how all your routes lay out with "rake routes" - - # This is a legacy wild controller route that's not recommended for RESTful applications. - # Note: This route will make all actions in every controller accessible via GET requests. - # match ':controller(/:action(/:id(.:format)))' -end diff --git a/t/rails3-app/db/seeds.rb b/t/rails3-app/db/seeds.rb deleted file mode 100644 index 664d8c7..0000000 --- a/t/rails3-app/db/seeds.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). -# -# Examples: -# -# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }]) -# Mayor.create(:name => 'Daley', :city => cities.first) diff --git a/t/rails3-app/doc/README_FOR_APP b/t/rails3-app/doc/README_FOR_APP deleted file mode 100644 index fe41f5c..0000000 --- a/t/rails3-app/doc/README_FOR_APP +++ /dev/null @@ -1,2 +0,0 @@ -Use this README file to introduce your application and point to useful places in the API for learning more. -Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries. diff --git a/t/rails3-app/lib/tasks/.gitkeep b/t/rails3-app/lib/tasks/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/t/rails3-app/public/404.html b/t/rails3-app/public/404.html deleted file mode 100644 index 44d986c..0000000 --- a/t/rails3-app/public/404.html +++ /dev/null @@ -1 +0,0 @@ -404 Not Found diff --git a/t/rails3-app/public/500.html b/t/rails3-app/public/500.html deleted file mode 100644 index e534a49..0000000 --- a/t/rails3-app/public/500.html +++ /dev/null @@ -1 +0,0 @@ -500 Internal Server Error diff --git a/t/rails3-app/public/x.txt b/t/rails3-app/public/x.txt deleted file mode 100644 index e427984..0000000 --- a/t/rails3-app/public/x.txt +++ /dev/null @@ -1 +0,0 @@ -HELLO diff --git a/t/rails3-app/script/rails b/t/rails3-app/script/rails deleted file mode 100755 index febedce..0000000 --- a/t/rails3-app/script/rails +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env ruby -# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. - -ENV_PATH = File.expand_path('../../config/environment', __FILE__) -BOOT_PATH = File.expand_path('../../config/boot', __FILE__) -APP_PATH = File.expand_path('../../config/application', __FILE__) - -require BOOT_PATH -require 'rails/commands' diff --git a/t/rails3-app/test/performance/browsing_test.rb b/t/rails3-app/test/performance/browsing_test.rb deleted file mode 100644 index 867fc8c..0000000 --- a/t/rails3-app/test/performance/browsing_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'test_helper' -require 'rails/performance_test_help' - -# Profiling results for each test method are written to tmp/performance. -class BrowsingTest < ActionDispatch::PerformanceTest - def test_homepage - get '/' - end -end diff --git a/t/rails3-app/test/test_helper.rb b/t/rails3-app/test/test_helper.rb deleted file mode 100644 index 8bf1192..0000000 --- a/t/rails3-app/test/test_helper.rb +++ /dev/null @@ -1,13 +0,0 @@ -ENV["RAILS_ENV"] = "test" -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' - -class ActiveSupport::TestCase - # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order. - # - # Note: You'll currently still have to declare fixtures explicitly in integration tests - # -- they do not yet inherit this setting - fixtures :all - - # Add more helper methods to be used by all tests here... -end diff --git a/t/rails3-app/vendor/plugins/.gitkeep b/t/rails3-app/vendor/plugins/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/t/t0300-rails3-basic.sh b/t/t0300-rails3-basic.sh deleted file mode 100755 index 8bf4066..0000000 --- a/t/t0300-rails3-basic.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -. ./test-rails3.sh - -t_plan 3 "Rails 3 (beta) tests" - -t_begin "setup and start" && { - rails3_app=$(cd rails3-app && pwd) - rm -rf $t_pfx.app - mkdir $t_pfx.app - cd $t_pfx.app - ( cd $rails3_app && tar cf - . ) | tar xf - - $RAKE db:sessions:create - $RAKE db:migrate - unicorn_setup - unicorn_rails -D -c $unicorn_config - unicorn_wait_start -} - -# add more tests here -t_begin "hit with curl" && { - test xHELLO = x"$(curl -sSf http://$listen/x.txt)" -} - -t_begin "killing succeeds" && { - kill $unicorn_pid -} - -t_done diff --git a/t/t0301-rails3-missing-config-ru.sh b/t/t0301-rails3-missing-config-ru.sh deleted file mode 100755 index 355ae44..0000000 --- a/t/t0301-rails3-missing-config-ru.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -. ./test-rails3.sh - -t_plan 4 "Rails 3 (beta) tests for config.ru haters" - -t_begin "setup and start" && { - rails3_app=$(cd rails3-app && pwd) - rm -rf $t_pfx.app - mkdir $t_pfx.app - cd $t_pfx.app - ( cd $rails3_app && tar cf - . ) | tar xf - - rm config.ru - $RAKE db:sessions:create - $RAKE db:migrate - unicorn_setup - unicorn_rails -D -c $unicorn_config - unicorn_wait_start -} - -t_begin "static file serving works" && { - test x"$(curl -sSf http://$listen/x.txt)" = xHELLO -} - -# add more tests here -t_begin "hit with curl" && { - curl -v http://$listen/ || : -} - -t_begin "killing succeeds" && { - kill $unicorn_pid -} - -t_done diff --git a/t/t0302-rails3-alt-working_directory.sh b/t/t0302-rails3-alt-working_directory.sh deleted file mode 100755 index 0a8894e..0000000 --- a/t/t0302-rails3-alt-working_directory.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -. ./test-rails3.sh - -t_plan 3 "Rails 3 (beta) inside alt working_directory (no config.ru)" - -t_begin "setup and start" && { - unicorn_setup - rails3_app=$(cd rails3-app && pwd) - rm -rf $t_pfx.app - mkdir $t_pfx.app - cd $t_pfx.app - ( cd $rails3_app && tar cf - . ) | tar xf - - rm config.ru - $RAKE db:sessions:create - $RAKE db:migrate - unicorn_setup - rm $pid - echo "working_directory '$t_pfx.app'" >> $unicorn_config - cd / - unicorn_rails -D -c $unicorn_config - unicorn_wait_start -} - -t_begin "static file serving works" && { - test x"$(curl -sSf http://$listen/x.txt)" = xHELLO -} - -t_begin "killing succeeds" && { - kill $unicorn_pid -} - -t_done diff --git a/t/t0303-rails3-alt-working_directory_config.ru.sh b/t/t0303-rails3-alt-working_directory_config.ru.sh deleted file mode 100755 index 1433f94..0000000 --- a/t/t0303-rails3-alt-working_directory_config.ru.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -. ./test-rails3.sh - -t_plan 5 "Rails 3 (beta) inside alt working_directory (w/ config.ru)" - -t_begin "setup and start" && { - unicorn_setup - rtmpfiles unicorn_config_tmp usocket - if test -e $usocket - then - die "unexpected $usocket" - fi - rails3_app=$(cd rails3-app && pwd) - rm -rf $t_pfx.app - mkdir $t_pfx.app - cd $t_pfx.app - ( cd $rails3_app && tar cf - . ) | tar xf - - $RAKE db:sessions:create - $RAKE db:migrate - unicorn_setup - rm $pid - - echo "#\\--daemonize --host $host --port $port -l $usocket" \ - >> $t_pfx.app/config.ru - - # we have --host/--port in config.ru instead - grep -v ^listen $unicorn_config | - grep -v ^pid > $unicorn_config_tmp - echo "working_directory '$t_pfx.app'" >> $unicorn_config_tmp - cd / - unicorn_rails -c $unicorn_config_tmp -} - -t_begin "pids in the right place" && { - if test -e $pid - then - die "pid=$pid not expected" - fi - - unicorn_rails_pid="$t_pfx.app/tmp/pids/unicorn.pid" - unicorn_pid=$(cat $unicorn_rails_pid) -} - -t_begin "static file serving works" && { - test x"$(curl -sSf http://$listen/x.txt)" = xHELLO -} - -t_begin "socket created" && { - test -S $usocket -} - -t_begin "killing succeeds" && { - kill $unicorn_pid -} - -t_done diff --git a/t/t0304-rails3-alt-working_directory_no_embed_cli.sh b/t/t0304-rails3-alt-working_directory_no_embed_cli.sh deleted file mode 100755 index c93f248..0000000 --- a/t/t0304-rails3-alt-working_directory_no_embed_cli.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -. ./test-rails3.sh - -t_plan 5 "Rails 3 (beta) inside alt working_directory (no embedded switches)" - -t_begin "setup and start" && { - unicorn_setup - rtmpfiles unicorn_config_tmp usocket - if test -e $usocket - then - die "unexpected $usocket" - fi - rails3_app=$(cd rails3-app && pwd) - rm -rf $t_pfx.app - mkdir $t_pfx.app - cd $t_pfx.app - ( cd $rails3_app && tar cf - . ) | tar xf - - $RAKE db:sessions:create - $RAKE db:migrate - unicorn_setup - rm $pid - - grep -v ^pid $unicorn_config > $unicorn_config_tmp - echo "working_directory '$t_pfx.app'" >> $unicorn_config_tmp - cd / - unicorn_rails -c $unicorn_config_tmp \ - --daemonize --host $host --port $port -l $usocket -} - -t_begin "pids in the right place" && { - if test -e $pid - then - die "pid=$pid not expected" - fi - - unicorn_rails_pid="$t_pfx.app/tmp/pids/unicorn.pid" - unicorn_pid=$(cat $unicorn_rails_pid) -} - -t_begin "static file serving works" && { - test x"$(curl -sSf http://$listen/x.txt)" = xHELLO -} - -t_begin "socket created" && { - test -S $usocket -} - -t_begin "killing succeeds" && { - kill $unicorn_pid -} - -t_done diff --git a/t/test-rails3.sh b/t/test-rails3.sh deleted file mode 100644 index 907ef0d..0000000 --- a/t/test-rails3.sh +++ /dev/null @@ -1,27 +0,0 @@ -. ./test-lib.sh -RAILS_VERSION=${RAILS_VERSION-3.0.0} -case $RUBY_VERSION in -1.8.7|1.9.2) ;; -*) - t_info "RUBY_VERSION=$RUBY_VERSION unsupported for Rails 3" - exit 0 - ;; -esac - -arch_gems=../tmp/isolate/ruby-$RUBY_VERSION/gems -rails_gems=../tmp/isolate/rails-$RAILS_VERSION/gems -rails_bin="$rails_gems/rails-$RAILS_VERSION/bin/rails" -if ! test -d "$arch_gems" || ! test -d "$rails_gems" || ! test -x "$rails_bin" -then - ( cd ../ && ./script/isolate_for_tests ) -fi - -for i in $arch_gems/*-* $rails_gems/*-* -do - if test -d $i/lib - then - RUBYLIB=$(cd $i/lib && pwd):$RUBYLIB - fi -done - -export RUBYLIB -- cgit v1.2.3-24-ge0c7