mongoid 3.1.6 → 4.0.2

data/spec/mongoid/relations/cascading/nullify_spec.rb

@@ -9,11 +9,11 @@ describe Mongoid::Relations::Cascading::Nullify do
   describe "#cascade" do
 
     let(:relation) do
-      stub
+      double
     end
 
     let(:metadata) do
-      stub(name: :posts)
+      double(name: :posts)
     end
 
     let(:strategy) do
@@ -21,11 +21,11 @@ describe Mongoid::Relations::Cascading::Nullify do
     end
 
     before do
-      person.should_receive(:posts).and_return(relation)
+      expect(person).to receive(:posts).and_return(relation)
     end
 
     it "nullifies the relation" do
-      relation.should_receive(:nullify)
+      expect(relation).to receive(:nullify)
       strategy.cascade
     end
   end

data/spec/mongoid/relations/cascading/restrict_spec.rb

@@ -16,7 +16,7 @@ describe Mongoid::Relations::Cascading::Restrict do
   end
 
   let(:metadata) do
-    stub(name: :drugs)
+    double(name: :drugs)
   end
 
   let(:strategy) do
@@ -26,7 +26,7 @@ describe Mongoid::Relations::Cascading::Restrict do
   describe "#cascade" do
 
     let(:drug) do
-      stub
+      double
     end
 
     context "when the document exists" do
@@ -34,18 +34,18 @@ describe Mongoid::Relations::Cascading::Restrict do
       context "when person has no drugs" do
 
         before do
-          person.should_receive(:drugs).and_return([ ])
+          expect(person).to receive(:drugs).and_return([ ])
         end
 
         it "deletes the person" do
-          expect { strategy.cascade }.to_not raise_error(Mongoid::Errors::DeleteRestriction)
+          expect { strategy.cascade }.to_not raise_error
         end
       end
 
       context "when person has drugs" do
 
         before do
-          person.should_receive(:drugs).and_return([ drug ])
+          expect(person).to receive(:drugs).and_return([ drug ])
         end
 
         it "it raises an error" do
@@ -56,11 +56,11 @@ describe Mongoid::Relations::Cascading::Restrict do
 
     context "when no document exists" do
       before do
-        person.should_receive(:drugs).and_return([])
+        expect(person).to receive(:drugs).and_return([])
       end
 
       it "doesn't delete anything" do
-        drug.should_receive(:delete).never
+        expect(drug).to receive(:delete).never
         strategy.cascade
       end
     end

data/spec/mongoid/relations/cascading_spec.rb

@@ -21,7 +21,7 @@ describe Mongoid::Relations::Cascading do
         end
 
         it "ignores the cascade" do
-          band.cascade!.should eq([ "records" ])
+          expect(band.cascade!).to eq([ "records" ])
         end
       end
     end
@@ -61,11 +61,11 @@ describe Mongoid::Relations::Cascading do
       end
 
       it "adds the action to the cascades" do
-        klass.cascades.should include("posts")
+        expect(klass.cascades).to include("posts")
       end
 
       it "returns self" do
-        cascaded.should eq(klass)
+        expect(cascaded).to eq(klass)
       end
     end
 
@@ -83,11 +83,11 @@ describe Mongoid::Relations::Cascading do
       end
 
       it "does not add an action to the cascades" do
-        klass.cascades.should_not include("posts")
+        expect(klass.cascades).to_not include("posts")
       end
 
       it "returns self" do
-        cascaded.should eq(klass)
+        expect(cascaded).to eq(klass)
       end
     end
   end
@@ -161,7 +161,7 @@ describe Mongoid::Relations::Cascading do
             end
 
             it "removes the references to the removed document" do
-              from_db.ratable_id.should be_nil
+              expect(from_db.ratable_id).to be_nil
             end
           end
 
@@ -186,7 +186,7 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "removes the references to the removed document" do
-                from_db.ratable_id.should be_nil
+                expect(from_db.ratable_id).to be_nil
               end
             end
 
@@ -197,7 +197,7 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "returns nil" do
-                book.send(method).should be_true
+                expect(book.send(method)).to be true
               end
             end
           end
@@ -221,11 +221,11 @@ describe Mongoid::Relations::Cascading do
             end
 
             it "removes the references from the removed document" do
-              person.preference_ids.should_not include(preference.id)
+              expect(person.preference_ids).to_not include(preference.id)
             end
 
             it "removes the references to the removed document" do
-              from_db.person_ids.should_not include(person.id)
+              expect(from_db.person_ids).to_not include(person.id)
             end
           end
         end
@@ -250,12 +250,12 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "raises no error" do
-                expect{ person.send(method) }.to_not raise_error(Mongoid::Errors::DeleteRestriction)
+                expect{ person.send(method) }.to_not raise_error
               end
 
               it "deletes the parent" do
                 person.send(method)
-                person.should be_destroyed
+                expect(person).to be_destroyed
               end
             end
 
@@ -289,12 +289,12 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "raises no error" do
-                expect{ person.send(method) }.to_not raise_error(Mongoid::Errors::DeleteRestriction)
+                expect{ person.send(method) }.to_not raise_error
               end
 
               it "deletes the parent" do
                 person.send(method)
-                person.should be_destroyed
+                expect(person).to be_destroyed
               end
             end
 
@@ -328,12 +328,12 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "raises no error" do
-                expect{ person.send(method) }.to_not raise_error(Mongoid::Errors::DeleteRestriction)
+                expect{ person.send(method) }.to_not raise_error
               end
 
               it "deletes the parent" do
                 person.send(method)
-                person.should be_destroyed
+                expect(person).to be_destroyed
               end
             end
 

data/spec/mongoid/relations/constraint_spec.rb

@@ -9,9 +9,10 @@ describe Mongoid::Relations::Constraint do
       before(:all) do
         Person.field(
           :_id,
-          type: Moped::BSON::ObjectId,
+          type: BSON::ObjectId,
           pre_processed: true,
-          default: ->{ Moped::BSON::ObjectId.new }
+          default: ->{ BSON::ObjectId.new },
+          overwrite: true
         )
       end
 
@@ -31,22 +32,22 @@ describe Mongoid::Relations::Constraint do
       context "when provided an object id" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         it "returns the object id" do
-          constraint.convert(object).should eq(object)
+          expect(constraint.convert(object)).to eq(object)
         end
       end
 
       context "when provided a string" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         it "returns an object id from the string" do
-          constraint.convert(object.to_s).should eq(object)
+          expect(constraint.convert(object.to_s)).to eq(object)
         end
       end
     end
@@ -67,7 +68,7 @@ describe Mongoid::Relations::Constraint do
       end
 
       it "returns the object" do
-        constraint.convert("testing").should eq("testing")
+        expect(constraint.convert("testing")).to eq("testing")
       end
     end
   end

data/spec/mongoid/relations/conversions_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Relations::Conversions do
       end
 
       let(:object) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:flagged) do
@@ -19,7 +19,7 @@ describe Mongoid::Relations::Conversions do
       end
 
       it "returns the object" do
-        flagged.should eq(object)
+        expect(flagged).to eq(object)
       end
     end
 
@@ -30,16 +30,18 @@ describe Mongoid::Relations::Conversions do
           :_id,
           type: String,
           pre_processed: true,
-          default: ->{ Moped::BSON::ObjectId.new.to_s }
+          overwrite: true,
+          default: ->{ BSON::ObjectId.new.to_s }
         )
       end
 
       after do
         Person.field(
           :_id,
-          type: Moped::BSON::ObjectId,
+          type: BSON::ObjectId,
           pre_processed: true,
-          default: ->{ Moped::BSON::ObjectId.new }
+          overwrite: true,
+          default: ->{ BSON::ObjectId.new }
         )
       end
 
@@ -50,7 +52,7 @@ describe Mongoid::Relations::Conversions do
       context "when provided an object id" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:flagged) do
@@ -58,14 +60,14 @@ describe Mongoid::Relations::Conversions do
         end
 
         it "returns the object id" do
-          flagged.should eq(object)
+          expect(flagged).to eq(object)
         end
       end
 
       context "when provided a string" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new.to_s
+          BSON::ObjectId.new.to_s
         end
 
         let(:flagged) do
@@ -73,11 +75,11 @@ describe Mongoid::Relations::Conversions do
         end
 
         it "returns the string" do
-          flagged.should eq(object)
+          expect(flagged).to eq(object)
         end
 
         it "marks the string as unconvertable" do
-          flagged.should be_unconvertable_to_bson
+          expect(flagged).to be_unconvertable_to_bson
         end
       end
     end
@@ -91,7 +93,7 @@ describe Mongoid::Relations::Conversions do
       context "when provided an object id" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:flagged) do
@@ -99,7 +101,7 @@ describe Mongoid::Relations::Conversions do
         end
 
         it "returns the object id" do
-          flagged.should eq(object)
+          expect(flagged).to eq(object)
         end
       end
 
@@ -114,11 +116,11 @@ describe Mongoid::Relations::Conversions do
         end
 
         it "returns the integer" do
-          flagged.should eq(15)
+          expect(flagged).to eq(15)
         end
 
         it "marks the integer as unconvertable" do
-          flagged.should be_unconvertable_to_bson
+          expect(flagged).to be_unconvertable_to_bson
         end
       end
     end

data/spec/mongoid/relations/counter_cache_spec.rb

@@ -4,6 +4,91 @@ describe Mongoid::Relations::CounterCache do
 
   describe "#reset_counters" do
 
+    context "when counter is reset" do
+
+      let(:person) do
+        Person.create do |person|
+          person[:drugs_count] = 3
+        end
+      end
+
+      before do
+        person.reset_counters(:drugs)
+      end
+
+      it "sets the counter to zero" do
+        expect(person.drugs_count).to eq(0)
+      end
+
+      it "persists the changes" do
+        expect(person.reload.drugs_count).to eq(0)
+      end
+    end
+
+    context "when reset with invalid name" do
+
+      let(:person) do
+        Person.create
+      end
+
+      it "expect to raise an error" do
+        expect {
+          person.reset_counters(:not_exist)
+        }.to raise_error
+      end
+    end
+
+    context "when counter gets messy" do
+
+      let(:person) do
+        Person.create
+      end
+
+      let!(:post) do
+        person.posts.create(title: "my first post")
+      end
+
+      before do
+        Person.update_counters(person.id, :posts_count => 10)
+        person.reload
+        person.reset_counters(:posts)
+      end
+
+      it "resets to the right value" do
+        expect(person.posts_count).to eq(1)
+      end
+
+      it "persists the change" do
+        expect(person.reload.posts_count).to eq(1)
+      end
+    end
+
+    context "when the counter is on a subclass" do
+
+      let(:subscription) do
+        Subscription.create
+      end
+
+      let!(:pack) do
+        subscription.packs.create
+      end
+
+      before do
+        subscription.reset_counters(:packs)
+      end
+
+      it "resets the appropriate counter" do
+        expect(subscription[:packs_count]).to eq(1)
+      end
+
+      it "persists the change" do
+        expect(subscription.reload[:packs_count]).to eq(1)
+      end
+    end
+  end
+
+  describe ".reset_counters" do
+
     context "when counter is reset" do
 
       let(:person) do