mongoid 4.0.0.alpha1 → 4.0.0.alpha2

data/spec/mongoid/relations/referenced/many_to_many_spec.rb

@@ -45,7 +45,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
           end
 
           it "does not persist the child document" do
-            preference.should_receive(:save).never
+            expect(preference).to receive(:save).never
             article.preferences.send(method, preference)
           end
         end
@@ -515,7 +515,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
           context "when errors are raised" do
 
             before do
-              post.should_receive(:before_add_tag).and_raise
+              expect(post).to receive(:before_add_tag).and_raise
             end
 
             it "does not add the document to the relation" do
@@ -537,7 +537,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
           context "when errors are raised" do
 
             before do
-              post.should_receive(:after_add_tag).and_raise
+              expect(post).to receive(:after_add_tag).and_raise
             end
 
             it "adds the document to the relation" do
@@ -1185,7 +1185,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
         context "when errors are raised" do
 
           before do
-            post.should_receive(:before_remove_tag).and_raise
+            expect(post).to receive(:before_remove_tag).and_raise
           end
 
           it "does not remove the document from the relation" do
@@ -1217,7 +1217,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
         context "when errors are raised" do
 
           before do
-            post.should_receive(:after_remove_tag).and_raise
+            expect(post).to receive(:after_remove_tag).and_raise
           end
 
           it "removes the document from the relation" do
@@ -2119,7 +2119,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
         context "when errors are raised" do
 
           before do
-            post.should_receive(:before_remove_tag).and_raise
+            expect(post).to receive(:before_remove_tag).and_raise
           end
 
           it "does not remove the document from the relation" do
@@ -2151,7 +2151,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
         context "when errors are raised" do
 
           before do
-            post.should_receive(:after_remove_tag).and_raise
+            expect(post).to receive(:after_remove_tag).and_raise
           end
 
           it "removes the document from the relation" do

data/spec/mongoid/relations/referenced/one_spec.rb

@@ -57,7 +57,7 @@ describe Mongoid::Relations::Referenced::One do
         end
 
         before do
-          metadata.should_receive(:criteria).never
+          expect(metadata).to receive(:criteria).never
           person.game = game
         end
 

data/spec/mongoid/relations/targets/enumerable_spec.rb

@@ -787,7 +787,7 @@ describe Mongoid::Relations::Targets::Enumerable do
           end
 
           it "receives query only once" do
-            criteria.should_receive(:first).once
+            expect(criteria).to receive(:first).once
             first
           end
         end
@@ -1212,7 +1212,7 @@ describe Mongoid::Relations::Targets::Enumerable do
         end
 
         it "receives query only once" do
-          criteria.should_receive(:last).once
+          expect(criteria).to receive(:last).once
           last
         end
       end

data/spec/mongoid/relations/touchable_spec.rb

@@ -269,6 +269,23 @@ describe Mongoid::Relations::Touchable do
         end
       end
 
+      context "when modifying the child" do
+
+        let!(:agency) do
+          Agency.create
+        end
+
+        let!(:agent) do
+          agency.agents.create(number: '1')
+        end
+
+        it "updates the parent's updated at" do
+          expect {
+            agent.update_attributes(number: '2')
+          }.to change { agency.updated_at }
+        end
+      end
+
       context "when destroying the child" do
 
         let!(:agency) do

data/spec/mongoid/scopable_spec.rb

@@ -4,29 +4,6 @@ describe Mongoid::Scopable do
 
   describe ".default_scope" do
 
-    context "when provided a criteria" do
-
-      let(:criteria) do
-        Band.where(name: "Depeche Mode")
-      end
-
-      before do
-        Band.default_scope criteria
-      end
-
-      after do
-        Band.default_scoping = nil
-      end
-
-      it "adds the default scope to the class" do
-        expect(Band.default_scoping.call).to eq(criteria)
-      end
-
-      it "flags as being default scoped" do
-        expect(Band).to be_default_scoping
-      end
-    end
-
     context "when provided a proc" do
 
       let(:criteria) do
@@ -50,7 +27,7 @@ describe Mongoid::Scopable do
       end
     end
 
-    context "when provided a non proc or criteria" do
+    context "when provided a non proc" do
 
       it "raises an error" do
         expect {
@@ -62,11 +39,11 @@ describe Mongoid::Scopable do
     context "when there is more then one default_scope" do
 
       let(:criteria) do
-        Band.where(name: "Depeche Mode")
+        ->{ Band.where(name: "Depeche Mode") }
       end
 
       let(:additional_criteria) do
-        Band.where(origin: "England")
+        ->{ Band.where(origin: "England") }
       end
 
       let(:proc_criteria) do
@@ -187,7 +164,7 @@ describe Mongoid::Scopable do
       context "when a block is provided" do
 
         before do
-          Band.scope(:active, Band.where(active: true)) do
+          Band.scope(:active, ->{ Band.where(active: true) }) do
             def add_origin
               tap { |c| c.selector[:origin] = "Deutschland" }
             end
@@ -215,7 +192,7 @@ describe Mongoid::Scopable do
         before do
           Record.scope(
             :tool,
-            Record.where(:name.in => [ "undertow", "aenima", "lateralus" ])
+            ->{ Record.where(:name.in => [ "undertow", "aenima", "lateralus" ]) }
           )
         end
 
@@ -249,7 +226,7 @@ describe Mongoid::Scopable do
       context "when no block is provided" do
 
         before do
-          Band.scope(:active, Band.where(active: true).skip(10))
+          Band.scope(:active, ->{ Band.where(active: true).skip(10) })
         end
 
         after do
@@ -287,7 +264,7 @@ describe Mongoid::Scopable do
           context "when chained to another scope" do
 
             before do
-              Band.scope(:english, Band.where(origin: "England"))
+              Band.scope(:english, ->{ Band.where(origin: "England") })
             end
 
             after do
@@ -369,8 +346,8 @@ describe Mongoid::Scopable do
 
           it "raises an exception" do
             expect {
-              Band.scope(:active, Band.where(active: true))
-              Band.scope(:active, Band.where(active: true))
+              Band.scope(:active, ->{ Band.where(active: true) })
+              Band.scope(:active, ->{ Band.where(active: true) })
             }.to raise_error(Mongoid::Errors::ScopeOverwrite)
           end
         end
@@ -386,8 +363,8 @@ describe Mongoid::Scopable do
           end
 
           it "raises no exception" do
-            Band.scope(:active, Band.where(active: true))
-            Band.scope(:active, Band.where(active: true))
+            Band.scope(:active, ->{ Band.where(active: true) })
+            Band.scope(:active, ->{ Band.where(active: true) })
           end
         end
       end
@@ -586,7 +563,7 @@ describe Mongoid::Scopable do
       end
     end
 
-    context "when chaining a non proc with a proc" do
+    context "when chaining a proc with a proc" do
 
       context "when both scopes are or queries" do
 
@@ -595,7 +572,7 @@ describe Mongoid::Scopable do
         end
 
         before do
-          Band.scope(:xxx, Band.any_of({ :aaa.gt => 0 }, { :bbb.gt => 0 }))
+          Band.scope(:xxx, ->{ Band.any_of({ :aaa.gt => 0 }, { :bbb.gt => 0 }) })
           Band.scope(:yyy, ->{ Band.any_of({ :ccc => nil }, { :ccc.gt => time }) })
         end
 
@@ -745,7 +722,7 @@ describe Mongoid::Scopable do
       end
 
       before do
-        Band.default_scope criteria
+        Band.default_scope ->{ criteria }
       end
 
       after do
@@ -780,7 +757,7 @@ describe Mongoid::Scopable do
     end
 
     before do
-      Band.default_scope criteria
+      Band.default_scope ->{ criteria }
     end
 
     after do
@@ -832,7 +809,7 @@ describe Mongoid::Scopable do
       context "when a named scope is called in the block" do
 
         before do
-          Band.scope(:skipped, Band.skip(10))
+          Band.scope(:skipped, ->{ Band.skip(10) })
         end
 
         after do
@@ -858,7 +835,7 @@ describe Mongoid::Scopable do
     end
 
     before do
-      Band.default_scope criteria
+      Band.default_scope ->{ criteria }
     end
 
     after do

data/spec/mongoid/sessions/options_spec.rb

@@ -50,7 +50,7 @@ describe Mongoid::Sessions::Options do
     end
 
     it "passes down the options to collection" do
-      Moped::Session.any_instance.should_receive(:with).with(options).and_return({})
+      expect_any_instance_of(Moped::Session).to receive(:with).with(options).and_return({})
       instance.collection
     end
   end

data/spec/mongoid/timestamps/timeless_spec.rb

@@ -73,11 +73,11 @@ describe Mongoid::Timestamps::Timeless do
         end
 
         it "does not set the created timestamp" do
-          document.created_at.should be_nil
+          expect(document.created_at).to be_nil
         end
 
         it "does not set the updated timestamp" do
-          document.updated_at.should be_nil
+          expect(document.updated_at).to be_nil
         end
 
         it "clears out the timeless option after save" do
@@ -91,7 +91,7 @@ describe Mongoid::Timestamps::Timeless do
           end
 
           it "sets the updated timestamp" do
-            document.updated_at.should_not be_nil
+            expect(document.updated_at).to_not be_nil
           end
         end
       end
@@ -103,11 +103,11 @@ describe Mongoid::Timestamps::Timeless do
         end
 
         it "does not set the created timestamp" do
-          document.created_at.should be_nil
+          expect(document.created_at).to be_nil
         end
 
         it "does not set the updated timestamp" do
-          document.updated_at.should be_nil
+          expect(document.updated_at).to be_nil
         end
 
         it "clears out the timeless option after save" do
@@ -121,7 +121,7 @@ describe Mongoid::Timestamps::Timeless do
           end
 
           it "sets the updated timestamp" do
-            document.updated_at.should_not be_nil
+            expect(document.updated_at).to_not be_nil
           end
         end
       end

data/spec/mongoid/timestamps/updated/short_spec.rb

@@ -71,7 +71,7 @@ describe Mongoid::Timestamps::Updated::Short do
     end
 
     it "does not run the update callbacks" do
-      agent.should_receive(:updated_at=).never
+      expect(agent).to receive(:updated_at=).never
       agent.save
     end
   end

data/spec/mongoid/timestamps/updated_spec.rb

@@ -63,7 +63,7 @@ describe Mongoid::Timestamps::Updated do
     end
 
     it "does not run the update callbacks" do
-      agent.should_receive(:updated_at=).never
+      expect(agent).to receive(:updated_at=).never
       agent.save
     end
   end

data/spec/mongoid/timestamps_spec.rb

@@ -49,7 +49,7 @@ describe Mongoid::Timestamps do
     end
 
     it "does not run the update callbacks" do
-      document.should_receive(:updated_at=).never
+      expect(document).to receive(:updated_at=).never
       document.save
     end
   end
@@ -66,7 +66,7 @@ describe Mongoid::Timestamps do
     end
 
     it "does not set updated at" do
-      document.should_receive(:updated_at=).never
+      expect(document).to receive(:updated_at=).never
       document.save
     end
   end

data/spec/mongoid/validatable/associated_spec.rb

@@ -89,7 +89,7 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
 
         before do
-          associated.should_receive(:validated?).and_return(false)
+          expect(associated).to receive(:validated?).and_return(false)
           validator.validate_each(person, :name, associated)
         end
 
@@ -105,7 +105,7 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
 
         before do
-          associated.should_receive(:validated?).and_return(false)
+          expect(associated).to receive(:validated?).and_return(false)
           validator.validate_each(person, :name, associated)
         end
 
@@ -139,7 +139,7 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
 
         before do
-          associated.should_receive(:validated?).and_return(false)
+          expect(associated).to receive(:validated?).and_return(false)
           validator.validate_each(person, :addresses, [ associated ])
         end
 
@@ -155,7 +155,7 @@ describe Mongoid::Validatable::AssociatedValidator do
         end
 
         before do
-          associated.should_receive(:validated?).and_return(false)
+          expect(associated).to receive(:validated?).and_return(false)
           validator.validate_each(person, :addresses, [ associated ])
         end
 

data/spec/mongoid/validatable/length_spec.rb

@@ -101,7 +101,7 @@ describe Mongoid::Validatable::LengthValidator do
           end
 
           it "adds no errors" do
-            product.errors[:sku].should be_empty
+            expect(product.errors[:sku]).to be_empty
           end
         end
 
@@ -112,7 +112,7 @@ describe Mongoid::Validatable::LengthValidator do
           end
 
           it "adds errors" do
-            product.errors[:sku].should eq(["is too long (maximum is 5 characters)"])
+            expect(product.errors[:sku]).to eq(["is too long (maximum is 5 characters)"])
           end
         end
       end
@@ -130,7 +130,7 @@ describe Mongoid::Validatable::LengthValidator do
           end
 
           it "adds no errors" do
-            product.errors[:stock_keeping_unit].should be_empty
+            expect(product.errors[:stock_keeping_unit]).to be_empty
           end
         end
 
@@ -141,7 +141,7 @@ describe Mongoid::Validatable::LengthValidator do
           end
 
           it "adds errors" do
-            product.errors[:stock_keeping_unit].should eq(["is too long (maximum is 5 characters)"])
+            expect(product.errors[:stock_keeping_unit]).to eq(["is too long (maximum is 5 characters)"])
           end
         end
       end
@@ -159,7 +159,7 @@ describe Mongoid::Validatable::LengthValidator do
           end
 
           it "adds no errors" do
-            product.errors[:tagline].should be_empty
+            expect(product.errors[:tagline]).to be_empty
           end
         end
 
@@ -173,7 +173,7 @@ describe Mongoid::Validatable::LengthValidator do
           end
 
           it "adds errors" do
-            product.errors[:tagline].should eq(["is too long (maximum is 5 characters)"])
+            expect(product.errors[:tagline]).to eq(["is too long (maximum is 5 characters)"])
           end
         end
 
@@ -184,7 +184,7 @@ describe Mongoid::Validatable::LengthValidator do
           end
 
           it "adds errors" do
-            product.errors[:tagline].should eq(["is too long (maximum is 5 characters)"])
+            expect(product.errors[:tagline]).to eq(["is too long (maximum is 5 characters)"])
           end
         end
       end