@@ -1,63 +1,15 @@ -# Be sure to restart your web server when you modify this file. - -# Uncomment below to force Rails into production mode when -# you don't control web/app server and can't set it the proper way -# ENV['RAILS_ENV'] ||= 'production' - -# Specifies gem version of Rails to use when vendor/rails is not present -# RAILS_GEM_VERSION = '1.1.6' - -# Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') require "rubygems" Rails::Initializer.run do |config| - # Settings in config/environments/* take precedence those specified here - - # Skip frameworks you're not going to use - # config.frameworks -= [ :action_web_service, :action_mailer ] - - # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{RAILS_ROOT}/extras ) - - # Force all environments to use the same logger level - # (by default production uses :info, the others :debug) - # config.log_level = :debug - - # Use the database for sessions instead of the file system - # (create the session table with 'rake db:sessions:create') - # config.action_controller.session_store = :active_record_store # config.action_controller.session = { # :session_key => '_example_rails_app', # :secret => '78b197e00cca77859c1e77d6498d16cd' # } - # 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 - - # Activate observers that should always be running - # config.active_record.observers = :cacher, :garbage_collector - - # Make Active Record use UTC-base instead of local time - # config.active_record.default_timezone = :utc - - # See Rails::Configuration for more options end -# Add new inflection rules using the following format -# (all these examples are active by default): -# 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 - -# Include your application configuration below - def in_memory_database? - ENV["RAILS_ENV"] == "test" and + ENV["RAILS_ENV"] == "test" and ActiveRecord::Base.connection.class.to_s == "ActiveRecord::ConnectionAdapters::SQLite3Adapter" and Rails::Configuration.new.database_configuration['test']['database'] == ':memory:' end @@ -66,4 +18,4 @@ if in_memory_database? puts "creating sqlite in memory database" # load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default ActiveRecord::Migrator.up('db/migrate') # use migrations -end \ No newline at end of file +end example_rails_app/config/environment.rb @@ -3,10 +3,10 @@ class InitialSchema < ActiveRecord::Migration create_table :people do |t| t.column :name, :string, :default => nil t.column :address, :text - end + end rescue nil end def self.down - drop_table :people + drop_table :people rescue nil end end example_rails_app/db/migrate/001_initial_schema.rb @@ -4,10 +4,10 @@ class CreateAnimals < ActiveRecord::Migration t.column :name, :string, :default => nil t.column :person_id, :integer t.column :age, :float - end + end rescue nil end def self.down - drop_table :animals + drop_table :animals rescue nil end end example_rails_app/db/migrate/002_create_animals.rb @@ -2,11 +2,11 @@ class CreateThings < ActiveRecord::Migration def self.up create_table :things do |t| t.column :name, :string, :default => nil - end + end rescue nil end def self.down - drop_table :things + drop_table :things rescue nil end end example_rails_app/db/migrate/003_create_things.rb @@ -2,15 +2,15 @@ class CreateMockables < ActiveRecord::Migration def self.up create_table :mockable_models do |t| t.column :name, :string - end + end rescue nil create_table :associated_models do |t| t.column :mockable_model_id, :integer - end + end rescue nil end def self.down - drop_table :mockable_models - drop_table :associated_models + drop_table :mockable_models rescue nil + drop_table :associated_models rescue nil end end example_rails_app/db/migrate/004_create_mockables.rb @@ -42,9 +42,9 @@ class PreCommit::RspecOnRails < PreCommit sh "git checkout #{pair[:tag]}" end puts "#####################################################" - cleanup(cleanup_rspec) ensure_db_config clobber_sqlite_data + cleanup(cleanup_rspec) generate_rspec generate_login_controller @@ -57,6 +57,7 @@ class PreCommit::RspecOnRails < PreCommit # a clean DB? rake_sh "db:test:prepare" sh "ruby vendor/plugins/rspec-rails/stories/all.rb" + ensure cleanup(cleanup_rspec) end pre_commit/lib/pre_commit/rspec_on_rails.rb de7f9e0667c09e354ee0a60054988fa93b266a11 Brian Takita brian.takita@gmail.com http://github.com/dchelimsky/rspec-dev/commit/d1782a195aa6040f3ef1c1654117e750bbf7a042 d1782a195aa6040f3ef1c1654117e750bbf7a042 2008-05-21T23:29:55-07:00 2008-05-21T23:29:42-07:00 Cleaning up Formatter. Making migrations less fragile to different versions of Rails. c0b8f790b01731a1ad9838b64d588d737dcf7e47 Brian Takita brian.takita@gmail.com