merge upstream

This commit is contained in:
Reinier Balt 2008-06-24 20:35:30 +02:00
parent c58186451f
commit ce1c092173
72 changed files with 4469 additions and 0 deletions

View file

@ -0,0 +1,2 @@
class ApplicationController < ActionController::Base
end

View file

@ -0,0 +1,14 @@
class Person < ActiveRecord::Base; end
class Place < ActiveRecord::Base; end
class Thing < ActiveRecord::Base; end
class Note < ActiveRecord::Base; end
class SideEffectyThing < ActiveRecord::Base
after_create do
Thing.create!
end
end
module ModelModule
class Model < ActiveRecord::Base; end
end

View file

@ -0,0 +1,44 @@
require 'rubygems'
gem 'plugit'
require 'plugit'
$LOAD_PATH << File.expand_path("#{File.dirname(__FILE__)}/../lib")
$LOAD_PATH << File.expand_path(File.dirname(__FILE__))
RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..")
Plugit.describe do |scenarios|
scenarios.environments_root_path = File.dirname(__FILE__) + '/environments'
vendor_directory = File.expand_path(File.dirname(__FILE__) + '/../vendor/plugins')
scenarios.environment :default, 'Released versions of Rails and RSpec' do |env|
env.library :rails, :export => "git clone git://github.com/rails/rails.git" do |rails|
rails.after_update { `git co v2.1.0_RC1` }
rails.load_paths = %w{/activesupport/lib /activerecord/lib /actionpack/lib}
rails.requires = %w{active_support active_record action_controller action_view}
end
env.library :rspec, :export => "git clone git://github.com/dchelimsky/rspec.git" do |rspec|
rspec.after_update { `git co 1.1.4 && mkdir -p #{vendor_directory} && ln -sF #{File.expand_path('.')} #{vendor_directory + '/rspec'}` }
rspec.requires = %w{spec}
end
env.library :rspec_rails, :export => "git clone git://github.com/dchelimsky/rspec-rails.git" do |rspec_rails|
rspec_rails.after_update { `git co 1.1.4` }
rspec_rails.requires = %w{spec/rails}
end
end
scenarios.environment :edge, 'Edge versions of Rails and RSpec' do |env|
env.library :rails, :export => "git clone git://github.com/rails/rails.git --depth 1" do |rails|
rails.before_install { `git pull` }
rails.load_paths = %w{/activesupport/lib /activerecord/lib /actionpack/lib}
rails.requires = %w{active_support active_record action_controller action_view}
end
env.library :rspec, :export => "git clone git://github.com/dchelimsky/rspec.git --depth 1" do |rspec|
rspec.after_update { `git pull && mkdir -p #{vendor_directory} && ln -sF #{File.expand_path('.')} #{vendor_directory + '/rspec'}` }
rspec.requires = %w{spec}
end
env.library :rspec_rails, :export => "git clone git://github.com/dchelimsky/rspec-rails.git --depth 1" do |rspec_rails|
rspec_rails.after_update { `git pull` }
rspec_rails.requires = %w{spec/rails}
end
end
end

View file

@ -0,0 +1,31 @@
ActiveRecord::Schema.define do
create_table :people, :force => true do |t|
t.column :first_name, :string
t.column :last_name, :string
end
create_table :places, :force => true do |t|
t.column :name, :string
t.column :location, :string
end
create_table :things, :force => true do |t|
t.column :name, :string
t.column :description, :string
end
create_table :side_effecty_things, :force => true do |t|
end
create_table :models, :force => true do |t|
t.column :name, :string
t.column :description, :string
end
create_table :notes, :force => true do |t|
t.column :content, :string
t.column :created_at, :datetime
t.column :updated_at, :datetime
end
end