mongo_mapper 0.12.0 → 0.13.0.beta1

data/{test/functional/test_scopes.rb → spec/functional/scopes_spec.rb}

@@ -1,8 +1,8 @@
-require 'test_helper'
+require 'spec_helper'
 
-class ScopesTest < Test::Unit::TestCase
+describe "Scopes" do
   context "Scopes" do
-    setup do
+    before do
       @document = Doc() do
         key :name, String
         key :age, Integer
@@ -11,33 +11,58 @@ class ScopesTest < Test::Unit::TestCase
     end
 
     context "basic scopes" do
-      setup do
+      before do
         @document.class_eval do
           scope :old, :age.gt => 60
           scope :teens, :age.gte => 13, :age.lte => 19
         end
       end
 
-      should "know what scopes have been added" do
+      it "should know what scopes have been added" do
         @document.scopes.size.should == 2
         @document.scopes.keys.map(&:to_s).sort.should == %w(old teens)
       end
 
-      should "return a plucky query" do
-        @document.old.should be_instance_of(Plucky::Query)
+      it "should return a plucky query" do
+        @document.old.should be_kind_of(Plucky::Query)
       end
 
-      should "work" do
+      it "should work" do
         @document.create(:name => 'John', :age => 99)
         @document.create(:name => 'Frank', :age => 15)
         docs = @document.old.all
         docs.size.should == 1
         docs[0].name.should == 'John'
       end
+
+      # Regression test for #534
+      context "when where() is invoked via a scope before a key is defined" do
+        let(:given_id) { BSON::ObjectId.new }
+        let(:doc) { Doc {
+           key :type, String
+
+           # Ordering is important here; where needs to happen before foo_id is defined
+           # in order to produce the behavior we're testing against regression.
+           scope :type, where(type: "bar")
+           key :foo_id, ObjectId
+        }}
+        before {
+          doc.collection.drop
+          doc.create({:foo_id => given_id})
+        }
+
+        it "should work without typecasts" do
+          doc.where(:foo_id => given_id).count.should == 1
+        end
+
+        it "should work with typecasts" do
+          doc.where(:foo_id => given_id.to_s).count.should == 1
+        end
+      end
     end
 
     context "dynamic scopes" do
-      setup do
+      before do
         @document.class_eval do
           scope :age,     lambda { |age| {:age => age} }
           scope :ages,    lambda { |low, high| {:age.gte => low, :age.lte => high} }
@@ -45,7 +70,7 @@ class ScopesTest < Test::Unit::TestCase
         end
       end
 
-      should "work with single argument" do
+      it "should work with single argument" do
         @document.create(:name => 'John', :age => 60)
         @document.create(:name => 'Frank', :age => 50)
         docs = @document.age(60).all
@@ -53,7 +78,7 @@ class ScopesTest < Test::Unit::TestCase
         docs.first.name.should == 'John'
       end
 
-      should "work with multiple arguments" do
+      it "should work with multiple arguments" do
         @document.create(:name => 'John', :age => 60)
         @document.create(:name => 'Frank', :age => 50)
         @document.create(:name => 'Bill', :age => 40)
@@ -62,7 +87,7 @@ class ScopesTest < Test::Unit::TestCase
         docs.map(&:name).sort.should == %w(Frank John)
       end
 
-      should "work with queries" do
+      it "should work with queries" do
         john  = @document.create(:name => 'John', :age => 60)
         frank = @document.create(:name => 'Frank', :age => 50)
         bill  = @document.create(:name => 'Bill', :age => 40)
@@ -71,13 +96,13 @@ class ScopesTest < Test::Unit::TestCase
     end
 
     context "query scopes" do
-      setup do
+      before do
         @document.class_eval do
           scope :boomers, where(:age.gte => 60).sort(:age)
         end
       end
 
-      should "work" do
+      it "should work" do
         todd = @document.create(:name => 'Todd', :age => 65)
         john = @document.create(:name => 'John', :age => 60)
         @document.create(:name => 'Frank', :age => 50)
@@ -89,14 +114,14 @@ class ScopesTest < Test::Unit::TestCase
     end
 
     context "chaining" do
-      setup do
+      before do
         @document.class_eval do
           scope :by_age,  lambda { |age| {:age => age} }
           scope :by_name, lambda { |name| {:name => name} }
         end
       end
 
-      should "work with scope methods" do
+      it "should work with scope methods" do
         @document.create(:name => 'John', :age => 60)
         @document.create(:name => 'Frank', :age => 60)
         @document.create(:name => 'Bill', :age => 50)
@@ -105,7 +130,7 @@ class ScopesTest < Test::Unit::TestCase
         docs.first.name.should == 'John'
       end
 
-      should "work on query methods" do
+      it "should work on query methods" do
         @document.create(:name => 'John', :age => 60)
         @document.create(:name => 'John', :age => 50)
         @document.create(:name => 'Bill', :age => 50)
@@ -115,7 +140,7 @@ class ScopesTest < Test::Unit::TestCase
       end
 
       context "with model methods" do
-        should "work if method returns a query" do
+        it "should work if method returns a query" do
           @document.create(:name => 'John', :age => 10)
           @document.create(:name => 'John', :age => 20)
           @document.class_eval do
@@ -128,15 +153,15 @@ class ScopesTest < Test::Unit::TestCase
           docs.first.age.should == 10
         end
 
-        should "not work if method does not return a query" do
+        it "should not work if method does not return a query" do
           @document.class_eval { def self.age; 20 end }
-          lambda { @document.by_name('John').age }.should raise_error(NoMethodError)
+          @document.by_name('John').age.should == 20
         end
       end
     end
 
     context "with single collection inheritance" do
-      setup do
+      before do
         class ::Item
           include MongoMapper::Document
           scope :by_title,  lambda { |title| {:title => title} }
@@ -148,24 +173,32 @@ class ScopesTest < Test::Unit::TestCase
         Item.collection.remove
 
         class ::Page < ::Item; end
-        class ::Blog < ::Item; end
+        class ::Blog < ::Item
+          key :slug, String
+          scope :by_slug, lambda { |slug| {:slug => slug} }
+        end
       end
 
-      teardown do
+      after do
         Object.send :remove_const, 'Item' if defined?(::Item)
         Object.send :remove_const, 'Page' if defined?(::Page)
         Object.send :remove_const, 'Blog' if defined?(::Blog)
       end
 
-      should "inherit scopes" do
+      it "should inherit scopes" do
         Page.scopes.keys.map(&:to_s).sort.should == %w(by_title published)
       end
 
-      should "work with _type" do
+      it "should work with _type" do
         item = Item.create(:title => 'Home')
         page = Page.create(:title => 'Home')
         Page.by_title('Home').first.should == page
       end
+
+      it "should limit subclass scopes to subclasses" do
+        Item.scopes.keys.map(&:to_s).should =~ %w(by_title published)
+        Blog.scopes.keys.map(&:to_s).should =~ %w(by_slug by_title published)
+      end
     end
   end
-end
+end

data/spec/functional/timestamps_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+describe "Timestamps" do
+  context "included" do
+    before do
+      @klass = Doc do
+        key :first_name, String
+      end
+      @klass.timestamps!
+    end
+
+    it "should set record_timestamps to true" do
+      @klass.record_timestamps.should be(true)
+    end
+  end
+
+  context "timestamping" do
+    before do
+      @klass = Doc do
+        key :first_name, String
+        key :last_name, String
+        key :age, Integer
+        key :date, Date
+      end
+      @klass.timestamps!
+    end
+
+    context "when #record_timestamps is set to true" do
+      it "should set created_at and updated_at on create" do
+        doc = @klass.new(:first_name => 'John', :age => 27)
+        doc.created_at.should be(nil)
+        doc.updated_at.should be(nil)
+        doc.save
+        doc.created_at.should_not be(nil)
+        doc.updated_at.should_not be(nil)
+      end
+
+      it "should not overwrite created_at if it already exists" do
+        original_created_at = 1.month.ago
+        doc = @klass.new(:first_name => 'John', :age => 27, :created_at => original_created_at)
+        doc.created_at.to_i.should == original_created_at.to_i
+        doc.updated_at.should be_nil
+        doc.save
+        doc.created_at.to_i.should == original_created_at.to_i
+        doc.updated_at.should_not be_nil
+      end
+
+      it "should set updated_at on field update but leave created_at alone" do
+        doc = @klass.create(:first_name => 'John', :age => 27)
+        old_created_at = doc.created_at
+        old_updated_at = doc.updated_at
+        doc.first_name = 'Johnny'
+
+        Timecop.freeze(Time.now + 5.seconds) do
+          doc.save
+        end
+
+        doc.created_at.should == old_created_at
+        doc.updated_at.should_not == old_updated_at
+      end
+
+      it "should set updated_at on document update but leave created_at alone" do
+        doc = @klass.create(:first_name => 'John', :age => 27)
+        old_created_at = doc.created_at.to_i
+
+        new_updated_at = Time.at(Time.now.to_i + 5.seconds)
+        Timecop.freeze(new_updated_at) do
+          @klass.update(doc._id, { :first_name => 'Johnny' })
+        end
+
+        doc = doc.reload
+        doc.created_at.to_i.should be_within(1).of(old_created_at.to_i)
+        doc.updated_at.to_i.should be_within(1).of(new_updated_at.to_i)
+      end
+    end
+
+    context "when #record_timestamps is set to false" do
+      before do
+        @klass.record_timestamps = false
+      end
+
+      after do
+        @klass.record_timestamps = true
+      end
+
+      it "should not set created_at on document create" do
+        doc = @klass.create(:first_name => "John")
+        doc.created_at.should be_nil
+      end
+
+      it "should not set updated_at on document create" do
+        doc = @klass.create(:first_name => "John")
+        doc.updated_at.should be_nil
+      end
+    end
+  end
+end

data/{test/functional/test_touch.rb → spec/functional/touch_spec.rb}

@@ -1,13 +1,13 @@
-require 'test_helper'
+require 'spec_helper'
 
-class TouchTest < Test::Unit::TestCase
+describe "Touch" do
   context "touch" do
     context "document" do
-      setup do
+      before do
         @document = Doc { timestamps! }
       end
 
-      should "update the updated_at timestamp" do
+      it "should update the updated_at timestamp" do
         doc = @document.create
         old_updated_at = doc.updated_at
 
@@ -21,7 +21,7 @@ class TouchTest < Test::Unit::TestCase
     end
 
     context "embedded document" do
-      should "update the updated_at timestamp" do
+      it "should update the updated_at timestamp" do
         Doc = Doc("Document") { timestamps!}
         Emdoc = EDoc("EmbeddedDocument") { timestamps! }
         Doc.has_many :emdocs, :class => Emdoc
@@ -45,7 +45,7 @@ class TouchTest < Test::Unit::TestCase
     end
 
     context "association" do
-      setup do
+      before do
         @post_class = Doc("Post") do
           key :touched_at, DateTime
           timestamps!
@@ -59,19 +59,19 @@ class TouchTest < Test::Unit::TestCase
         @post_class.many :comments, :class => @comment_class
       end
 
-      should 'not be true by default' do
+      it 'should not be true by default' do
         @comment_class.belongs_to :post, :class => @post_class
         @comment_class.associations[:post].touch?.should_not be_true
       end
 
       context 'touch the parent when true' do
-        setup do
+        before do
           @comment_class.belongs_to :post, :class => @post_class, :touch => true
           @post = @post_class.create(:title => 'Hello, world!')
           @comment = @post.comments.build
         end
 
-        should "when the child is created" do
+        it "should when the child is created" do
           orig_updated_at = @post.updated_at
           Timecop.freeze(Time.now + 1.day) do
             @comment.save
@@ -80,7 +80,7 @@ class TouchTest < Test::Unit::TestCase
           @post.reload.updated_at.should_not == orig_updated_at
         end
         
-        should "when the child is updated" do
+        it "should when the child is updated" do
           @comment.save
           old_updated_at = @post.updated_at
           Timecop.freeze(Time.now + 2.day) do
@@ -89,7 +89,7 @@ class TouchTest < Test::Unit::TestCase
           @post.reload.updated_at.should_not == old_updated_at
         end
         
-        should "when the child is touched" do
+        it "should when the child is touched" do
           @comment.save
           old_updated_at = @post.updated_at
           Timecop.freeze(Time.now + 3.day) do
@@ -100,7 +100,7 @@ class TouchTest < Test::Unit::TestCase
       end
 
       context "when set to a symbol that is a key of parent" do
-        should "set that key on touch events" do
+        it "should set that key on touch events" do
           @comment_class.belongs_to :post, :class => @post_class, :touch => :touched_at
           post = @post_class.create(:title => 'Hello, world!')
           post.touched_at.should be_nil
@@ -111,7 +111,7 @@ class TouchTest < Test::Unit::TestCase
         end
       end
 
-      should 'not touch the parent when false' do
+      it 'should not touch the parent when false' do
         post = @post_class.create(:title => 'Hello, world!')
         comment = post.comments.build
         Timecop.freeze(Time.now + 1.day) do

data/spec/functional/userstamps_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+module Userstamps
+  describe "Userstamps" do
+    class AltUser
+      include MongoMapper::Document
+    end
+
+    context "userstamping" do
+      before do
+        @document = Doc do
+          userstamps!
+        end
+        @document_alt_user = Doc do
+          userstamps! :class_name => 'Userstamps::AltUser'
+        end
+        @document_alt_user_class = Doc do
+          userstamps! :class => Userstamps::AltUser
+        end
+        @docs = [@document, @document_alt_user, @document_alt_user_class]
+      end
+
+      it "should add creator_id key" do
+        @docs.each{ |d| d.keys.should include('creator_id') }
+      end
+
+      it "should add updater_id key" do
+        @docs.each{ |d| d.keys.should include('updater_id') }
+      end
+
+      it "should add belongs_to creator" do
+        @docs.each{ |d| d.associations.keys.should include(:creator) }
+      end
+
+      it "should add belongs_to updater" do
+        @docs.each{ |d| d.associations.keys.should include(:updater) }
+      end
+
+      it "should properly set class names" do
+        @document.associations[:creator].class_name.should == 'User'
+        @document_alt_user.associations[:creator].class_name.should == 'Userstamps::AltUser'
+        @document_alt_user_class.associations[:creator].class_name.should == 'Userstamps::AltUser'
+      end
+    end
+  end
+end

data/{test/functional/test_validations.rb → spec/functional/validations_spec.rb}

@@ -1,20 +1,20 @@
-require 'test_helper'
+require 'spec_helper'
 
-class ValidationsTest < Test::Unit::TestCase
+describe "Validations" do
   context "Saving a new document that is invalid" do
-    setup do
+    before do
       @document = Doc do
         key :name, String, :required => true
       end
     end
 
-    should "not insert document" do
+    it "should not insert document" do
       doc = @document.new
       doc.save
       @document.count.should == 0
     end
 
-    should "populate document's errors" do
+    it "should populate document's errors" do
       doc = @document.new
       doc.errors.size.should == 0
       doc.save
@@ -23,18 +23,18 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   context "Saving a document that is invalid (destructive)" do
-    setup do
+    before do
       @document = Doc do
         key :name, String, :required => true
       end
     end
 
-    should "raise error" do
+    it "should raise error" do
       doc = @document.new
       lambda { doc.save! }.should raise_error(MongoMapper::DocumentNotValid)
     end
 
-    should "set document on exception" do
+    it "should set document on exception" do
       doc = @document.new
       begin
         doc.save!
@@ -45,24 +45,24 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   context "Creating a document that is invalid (destructive)" do
-    setup do
+    before do
       @document = Doc do
         key :name, String, :required => true
       end
     end
 
-    should "raise error" do
+    it "should raise error" do
       lambda { @document.create! }.should raise_error(MongoMapper::DocumentNotValid)
     end
 
-    should "create a new document" do
+    it "should create a new document" do
       instance = @document.create!(:name => "James")
       instance.new_record?.should be_false
     end
   end
 
   context "Saving an existing document that is invalid" do
-    setup do
+    before do
       @document = Doc do
         key :name, String, :required => true
       end
@@ -70,13 +70,13 @@ class ValidationsTest < Test::Unit::TestCase
       @doc = @document.create(:name => 'John Nunemaker')
     end
 
-    should "not update document" do
+    it "should not update document" do
       @doc.name = nil
       @doc.save
       @doc.reload.name.should == 'John Nunemaker'
     end
 
-    should "populate document's errors" do
+    it "should populate document's errors" do
       @doc.name = nil
       @doc.save
       @doc.errors.full_messages.should == ["Name can't be blank"]
@@ -84,7 +84,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   context "Adding validation errors" do
-    setup do
+    before do
       @document = Doc do
         key :action, String
         def action_present
@@ -93,7 +93,7 @@ class ValidationsTest < Test::Unit::TestCase
       end
     end
 
-    should "work with validate :on => :create callback" do
+    it "should work with validate :on => :create callback" do
       @document.validate :action_present, :on => :create
 
       doc = @document.create(:action => nil)
@@ -104,7 +104,7 @@ class ValidationsTest < Test::Unit::TestCase
       doc.should_not have_error_on(:action)
     end
 
-    should "work with validate :on => :update callback" do
+    it "should work with validate :on => :update callback" do
       @document.validate :action_present, :on => :update
 
       doc = @document.new
@@ -121,19 +121,19 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   context "validating uniqueness of" do
-    setup do
+    before do
       @document = Doc do
         key :name, String
         validates_uniqueness_of :name
       end
     end
 
-    should "not fail if object is new" do
+    it "should not fail if object is new" do
       doc = @document.new
       doc.should_not have_error_on(:name)
     end
 
-    should "not fail when new object is out of scope" do
+    it "should not fail when new object is out of scope" do
       document = Doc do
         key :name
         key :adult
@@ -146,40 +146,40 @@ class ValidationsTest < Test::Unit::TestCase
       doc2.should be_valid
     end
 
-    should "work with i18n taken message" do
+    it "should work with i18n taken message" do
       @document.create(:name => 'joe')
       doc = @document.create(:name => 'joe')
       doc.should have_error_on(:name, 'has already been taken')
     end
 
-    should "allow to update an object" do
+    it "should allow to update an object" do
       doc = @document.new("name" => "joe")
       doc.save.should be_true
 
       @document \
-        .stubs(:first) \
+        .stub(:first) \
         .with(:name => 'joe') \
-        .returns(doc)
+        .and_return(doc)
 
       doc.name = "joe"
       doc.valid?.should be_true
       doc.should_not have_error_on(:name)
     end
 
-    should "fail if object name is not unique" do
+    it "should fail if object name is not unique" do
       doc = @document.new("name" => "joe")
       doc.save.should be_true
 
       @document \
-        .stubs(:first) \
+        .stub(:first) \
         .with(:name => 'joe') \
-        .returns(doc)
+        .and_return(doc)
 
       doc2 = @document.new("name" => "joe")
       doc2.should have_error_on(:name)
     end
 
-    should "allow multiple blank entries if :allow_blank => true" do
+    it "should allow multiple blank entries if :allow_blank => true" do
       document = Doc do
         key :name
         validates_uniqueness_of :name, :allow_blank => :true
@@ -189,15 +189,15 @@ class ValidationsTest < Test::Unit::TestCase
       doc.save.should be_true
 
       document \
-        .stubs(:first) \
+        .stub(:first) \
         .with(:name => '') \
-        .returns(doc)
+        .and_return(doc)
 
       doc2 = document.new("name" => "")
       doc2.should_not have_error_on(:name)
     end
 
-    should "allow multiple nil entries if :allow_nil => true" do
+    it "should allow multiple nil entries if :allow_nil => true" do
       document = Doc do
         key :name
         validates_uniqueness_of :name, :allow_nil => :true
@@ -210,7 +210,7 @@ class ValidationsTest < Test::Unit::TestCase
       doc2.should_not have_error_on(:name)
     end
 
-    should "allow entries that differ only in case by default" do
+    it "should allow entries that differ only in case by default" do
       document = Doc do
         key :name
         validates_uniqueness_of :name
@@ -224,14 +224,14 @@ class ValidationsTest < Test::Unit::TestCase
     end
 
     context "with :case_sensitive => false" do
-      setup do
+      before do
         @document = Doc do
           key :name
           validates_uniqueness_of :name, :case_sensitive => false
         end
       end
 
-      should "fail on entries that differ only in case" do
+      it "should fail on entries that differ only in case" do
         doc = @document.new("name" => "BLAMMO")
         doc.save.should be_true
 
@@ -239,17 +239,17 @@ class ValidationsTest < Test::Unit::TestCase
         doc2.should have_error_on(:name)
       end
 
-      should "not raise an error if value is nil" do
+      it "should not raise an error if value is nil" do
         doc = @document.new("name" => nil)
         lambda { doc.valid? }.should_not raise_error
       end
 
-      should "not raise an error if special Regexp characters used" do
+      it "should not raise an error if special Regexp characters used" do
         doc = @document.new("name" => '?')
         lambda { doc.valid? }.should_not raise_error
       end
 
-      should "check for uniqueness using entire string" do
+      it "should check for uniqueness using entire string" do
         doc = @document.new("name" => "John Doe")
         doc.save.should be_true
 
@@ -259,7 +259,7 @@ class ValidationsTest < Test::Unit::TestCase
     end
 
     context "scoped by a single attribute" do
-      setup do
+      before do
         @document = Doc do
           key :name, String
           key :scope, String
@@ -267,27 +267,27 @@ class ValidationsTest < Test::Unit::TestCase
         end
       end
 
-      should "fail if the same name exists in the scope" do
+      it "should fail if the same name exists in the scope" do
         doc = @document.new("name" => "joe", "scope" => "one")
         doc.save.should be_true
 
         @document \
-          .stubs(:first) \
+          .stub(:first) \
           .with(:name => 'joe', :scope => "one") \
-          .returns(doc)
+          .and_return(doc)
 
         doc2 = @document.new("name" => "joe", "scope" => "one")
         doc2.should have_error_on(:name)
       end
 
-      should "pass if the same name exists in a different scope" do
+      it "should pass if the same name exists in a different scope" do
         doc = @document.new("name" => "joe", "scope" => "one")
         doc.save.should be_true
 
         @document \
-          .stubs(:first) \
+          .stub(:first) \
           .with(:name => 'joe', :scope => 'two') \
-          .returns(nil)
+          .and_return(nil)
 
         doc2 = @document.new("name" => "joe", "scope" => "two")
         doc2.should_not have_error_on(:name)
@@ -295,7 +295,7 @@ class ValidationsTest < Test::Unit::TestCase
     end
 
     context "scoped by a multiple attributes" do
-      setup do
+      before do
         @document = Doc do
           key :name, String
           key :first_scope, String
@@ -304,27 +304,27 @@ class ValidationsTest < Test::Unit::TestCase
         end
       end
 
-      should "fail if the same name exists in the scope" do
+      it "should fail if the same name exists in the scope" do
         doc = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc.save.should be_true
 
         @document \
-          .stubs(:first) \
+          .stub(:first) \
           .with(:name => 'joe', :first_scope => 'one', :second_scope => 'two') \
-          .returns(doc)
+          .and_return(doc)
 
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc2.should have_error_on(:name)
       end
 
-      should "pass if the same name exists in a different scope" do
+      it "should pass if the same name exists in a different scope" do
         doc = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "two")
         doc.save.should be_true
 
         @document \
-          .stubs(:first) \
+          .stub(:first) \
           .with(:name => 'joe', :first_scope => 'one', :second_scope => 'one') \
-          .returns(nil)
+          .and_return(nil)
 
         doc2 = @document.new("name" => "joe", "first_scope" => "one", "second_scope" => "one")
         doc2.should_not have_error_on(:name)
@@ -333,7 +333,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   context "validating associated docs" do
-    setup do
+    before do
       @child_class = EDoc do
         key :name, :required => true
       end
@@ -342,19 +342,19 @@ class ValidationsTest < Test::Unit::TestCase
       @root_class.many :children, :class => @child_class
       @root_class.validates_associated :children, :message => 'are invalid'
     end
-    
-    should "pass if there are no associated docs" do
+
+    it "should pass if there are no associated docs" do
       doc = @root_class.new
       doc.save.should be_true
     end
-    
-    should "pass if the associated doc is valid" do
+
+    it "should pass if the associated doc is valid" do
       doc = @root_class.new
       doc.children.build(:name => 'Joe')
       doc.save.should be_true
     end
 
-    should "fail if the associated doc is invalid" do
+    it "should fail if the associated doc is invalid" do
       doc = @root_class.new
       doc.children.build
       doc.should have_error_on(:children, 'are invalid')
@@ -363,7 +363,7 @@ class ValidationsTest < Test::Unit::TestCase
   end
 
   context "validating associated docs with custom context" do
-    setup do
+    before do
       @child_class = EDoc do
         key :name
 
@@ -375,18 +375,18 @@ class ValidationsTest < Test::Unit::TestCase
       @root_class.validates_associated :children, :context => :custom_context
     end
 
-    should "pass if there are no associated docs" do
+    it "should pass if there are no associated docs" do
       doc = @root_class.new
       doc.valid?(:custom_context).should be_true
     end
 
-    should "pass if the associated doc is valid" do
+    it "should pass if the associated doc is valid" do
       doc = @root_class.new
       doc.children.build(:name => 'George')
       doc.valid?(:custom_context).should be_true
     end
 
-    should "fail if the associated doc is invalid" do
+    it "should fail if the associated doc is invalid" do
       doc = @root_class.new
       doc.children.build(:name => 'Bob')
       doc.valid?(:custom_context).should_not be_true
@@ -394,7 +394,7 @@ class ValidationsTest < Test::Unit::TestCase
 
   end
   # context "validates uniqueness of with :unique shortcut" do
-  #   should "work" do
+  #   it "should work" do
   #     @document = Doc do
   #       key :name, String, :unique => true
   #     end
@@ -403,9 +403,9 @@ class ValidationsTest < Test::Unit::TestCase
   #     doc.should_not have_error_on(:name)
   #
   #     @document \
-  #       .stubs(:first) \
+  #       .stub(:first) \
   #       .with(:name => 'John') \
-  #       .returns(doc)
+  #       .and_return(doc)
   #
   #     second_john = @document.create(:name => 'John')
   #     second_john.should have_error_on(:name, 'has already been taken')