merge from master (post-CSRF changes)

3 files changed, 25 insertions, 0 deletions

diff --git a/vendor/gems/rspec-rails-1.3.3/spec/resources/models/animal.rb b/vendor/gems/rspec-rails-1.3.3/spec/resources/models/animal.rb
new file mode 100644
index 000000000..3ce078ad4
--- /dev/null
+++ b/vendor/gems/rspec-rails-1.3.3/spec/resources/models/animal.rb
@@ -0,0 +1,4 @@
+class Animal < ActiveRecord::Base
+  belongs_to :person
+  validates_uniqueness_of :name
+end
diff --git a/vendor/gems/rspec-rails-1.3.3/spec/resources/models/person.rb b/vendor/gems/rspec-rails-1.3.3/spec/resources/models/person.rb
new file mode 100644
index 000000000..7f9607e57
--- /dev/null
+++ b/vendor/gems/rspec-rails-1.3.3/spec/resources/models/person.rb
@@ -0,0 +1,18 @@
+class Person < ActiveRecord::Base
+  has_many :animals do
+    def pups
+      find(:all, :conditions => 'age < 1')
+    end
+    def adults
+      find(:all, :conditions => 'age >= 1')
+    end
+  end
+  validates_presence_of :name
+  
+  def add_animal animal
+    animal.person = self
+    animals << animal
+    animal.save
+  end
+    
+end
diff --git a/vendor/gems/rspec-rails-1.3.3/spec/resources/models/thing.rb b/vendor/gems/rspec-rails-1.3.3/spec/resources/models/thing.rb
new file mode 100644
index 000000000..c674804ac
--- /dev/null
+++ b/vendor/gems/rspec-rails-1.3.3/spec/resources/models/thing.rb
@@ -0,0 +1,3 @@
+class Thing < ActiveRecord::Base
+  validates_presence_of :name
+end