mongoid 3.1.7 → 4.0.2

data/spec/mongoid/relations/accessors_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "returns true" do
-          person.should have_game
+          expect(person).to have_game
         end
       end
 
@@ -26,14 +26,14 @@ describe Mongoid::Relations::Accessors do
         context "when not autobuilding" do
 
           it "returns false" do
-            person.should_not have_game
+            expect(person).to_not have_game
           end
         end
 
         context "when autobuilding" do
 
           it "returns false" do
-            person.should_not have_book
+            expect(person).to_not have_book
           end
         end
       end
@@ -48,14 +48,14 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "returns true" do
-          person.should have_posts
+          expect(person).to have_posts
         end
       end
 
       context "when the relation does not have documents" do
 
         it "returns false" do
-          person.should_not have_posts
+          expect(person).to_not have_posts
         end
       end
     end
@@ -69,14 +69,14 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "returns true" do
-          person.should have_preferences
+          expect(person).to have_preferences
         end
       end
 
       context "when the relation does not have documents" do
 
         it "returns false" do
-          person.should_not have_preferences
+          expect(person).to_not have_preferences
         end
       end
     end
@@ -90,7 +90,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "allows the existence check" do
-          user.should_not have_next
+          expect(user).to_not have_next
         end
       end
 
@@ -101,7 +101,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "returns true" do
-          game.should have_person
+          expect(game).to have_person
         end
       end
 
@@ -114,7 +114,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "returns false" do
-            game.should_not have_person
+            expect(game).to_not have_person
           end
         end
 
@@ -125,7 +125,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "returns false" do
-            book.should_not have_person
+            expect(book).to_not have_person
           end
         end
       end
@@ -140,7 +140,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "returns true" do
-          person.should have_name
+          expect(person).to have_name
         end
       end
 
@@ -149,7 +149,7 @@ describe Mongoid::Relations::Accessors do
         context "when the relation does not autobuild" do
 
           it "returns false" do
-            person.should_not have_name
+            expect(person).to_not have_name
           end
         end
 
@@ -160,7 +160,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "returns false" do
-            person.should_not have_passport
+            expect(person).to_not have_passport
           end
         end
       end
@@ -175,14 +175,14 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "returns true" do
-          person.should have_addresses
+          expect(person).to have_addresses
         end
       end
 
       context "when the relation does not have documents" do
 
         it "returns false" do
-          person.should_not have_addresses
+          expect(person).to_not have_addresses
         end
       end
     end
@@ -196,7 +196,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "returns true" do
-          name.should have_namable
+          expect(name).to have_namable
         end
       end
 
@@ -209,7 +209,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "returns false" do
-            name.should_not have_namable
+            expect(name).to_not have_namable
           end
         end
 
@@ -220,7 +220,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "returns false" do
-            passport.should_not have_person
+            expect(passport).to_not have_person
           end
         end
       end
@@ -244,11 +244,11 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "builds the new document" do
-            passport.should be_a(Passport)
+            expect(passport).to be_a(Passport)
           end
 
           it "stores in the altered attribute" do
-            person.as_document["pass"].should eq(passport.attributes)
+            expect(person.as_document["pass"]).to eq(passport.attributes)
           end
         end
 
@@ -259,7 +259,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "does not build a new document" do
-            person.passport.should eq(passport)
+            expect(person.passport).to eq(passport)
           end
         end
       end
@@ -277,7 +277,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "builds the new document" do
-            person.should be_a(Person)
+            expect(person).to be_a(Person)
           end
         end
 
@@ -288,7 +288,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "does not build a new document" do
-            passport.person.should eq(person)
+            expect(passport.person).to eq(person)
           end
         end
       end
@@ -302,7 +302,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "builds the new document" do
-            book.should be_a(Book)
+            expect(book).to be_a(Book)
           end
         end
 
@@ -313,7 +313,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "does not build a new document" do
-            person.book.should eq(book)
+            expect(person.book).to eq(book)
           end
         end
       end
@@ -331,7 +331,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "builds the new document" do
-            person.should be_a(Person)
+            expect(person).to be_a(Person)
           end
         end
 
@@ -342,7 +342,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "does not build a new document" do
-            book.person.should eq(person)
+            expect(book.person).to eq(person)
           end
         end
       end
@@ -371,11 +371,11 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            preferences.should eq([ preference ])
+            expect(preferences).to eq([ preference ])
           end
 
           it "reloads a new instance" do
-            preferences.first.should_not equal(preference)
+            expect(preferences.first).to_not equal(preference)
           end
         end
 
@@ -386,11 +386,11 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            preferences.should eq([ preference ])
+            expect(preferences).to eq([ preference ])
           end
 
           it "reloads a new instance" do
-            preferences.first.should_not equal(preference)
+            expect(preferences.first).to_not equal(preference)
           end
         end
 
@@ -401,7 +401,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            preferences.should eq([ preference ])
+            expect(preferences).to eq([ preference ])
           end
         end
       end
@@ -423,11 +423,11 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            posts.should eq([ post ])
+            expect(posts).to eq([ post ])
           end
 
           it "reloads a new instance" do
-            posts.first.should_not equal(post)
+            expect(posts.first).to_not equal(post)
           end
         end
 
@@ -438,11 +438,11 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            posts.should eq([ post ])
+            expect(posts).to eq([ post ])
           end
 
           it "reloads a new instance" do
-            posts.first.should_not equal(post)
+            expect(posts.first).to_not equal(post)
           end
         end
 
@@ -453,7 +453,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            posts.should eq([ post ])
+            expect(posts).to eq([ post ])
           end
         end
       end
@@ -475,11 +475,11 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            reloaded_game.should eq(game)
+            expect(reloaded_game).to eq(game)
           end
 
           it "reloads a new instance" do
-            reloaded_game.should_not equal(game)
+            expect(reloaded_game).to_not equal(game)
           end
         end
 
@@ -490,11 +490,11 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            reloaded_game.should eq(game)
+            expect(reloaded_game).to eq(game)
           end
 
           it "reloads a new instance" do
-            reloaded_game.should_not equal(game)
+            expect(reloaded_game).to_not equal(game)
           end
         end
 
@@ -505,7 +505,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "reloads the correct documents" do
-            reloaded_game.should eq(game)
+            expect(reloaded_game).to eq(game)
           end
         end
       end
@@ -538,7 +538,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "returns the correct document" do
-            rating.ratable.should eq(movie)
+            expect(rating.ratable).to eq(movie)
           end
         end
 
@@ -549,7 +549,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "returns the correct documents" do
-            ratings.should eq([ movie_rating ])
+            expect(ratings).to eq([ movie_rating ])
           end
         end
 
@@ -560,99 +560,7 @@ describe Mongoid::Relations::Accessors do
           end
 
           it "returns the correct document" do
-            rating.should eq(book_rating)
-          end
-        end
-      end
-
-      context "when there are multiple references many/one" do
-
-        let(:face) do
-          Face.create
-        end
-
-        let(:eye_bowl) do
-          EyeBowl.create
-        end
-
-        let!(:face_left_eye) do
-          face.create_left_eye(pupil_dilation: 10)
-        end
-
-        let!(:face_right_eye) do
-          face.create_right_eye(pupil_dilation: 5)
-        end
-
-        let!(:eye_bowl_blue_eye) do
-          eye_bowl.blue_eyes.create(pupil_dilation: 2)
-        end
-
-        let!(:eye_bowl_brown_eye) do
-          eye_bowl.brown_eyes.create(pupil_dilation: 1)
-        end
-
-        context "when accessing a referenced in" do
-
-          let(:eye) do
-            Eye.where(pupil_dilation: 10).first
-          end
-
-          it "returns the correct type" do
-            eye.eyeable.should be_a(Face)
-          end
-
-          it "returns the correct document" do
-            eye.eyeable.should eq(face)
-          end
-        end
-
-        context "when accessing a references many" do
-
-          context "first references many" do
-
-            let(:eyes) do
-              EyeBowl.first.blue_eyes
-            end
-
-            it "returns the correct documents" do
-              eyes.should eq([ eye_bowl_blue_eye ])
-            end
-          end
-
-          context "second references many" do
-
-            let(:eyes) do
-              EyeBowl.first.brown_eyes
-            end
-
-            it "returns the correct documents" do
-              eyes.should eq([ eye_bowl_brown_eye ])
-            end
-          end
-        end
-
-        context "when accessing a references one" do
-
-          context "first references one" do
-
-            let(:eye) do
-              Face.first.left_eye
-            end
-
-            it "returns the correct document" do
-              eye.should eq(face_left_eye)
-            end
-          end
-
-          context "second references one" do
-
-            let(:eye) do
-              Face.first.right_eye
-            end
-
-            it "returns the correct document" do
-              eye.should eq(face_right_eye)
-            end
+            expect(rating).to eq(book_rating)
           end
         end
       end
@@ -674,7 +582,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "converts them to nil" do
-          post.person.should be_nil
+          expect(post.person).to be_nil
         end
       end
 
@@ -685,7 +593,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "converts it to nil" do
-          post.person_id.should be_nil
+          expect(post.person_id).to be_nil
         end
       end
     end
@@ -703,7 +611,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "converts them to nil" do
-          person.game.should be_nil
+          expect(person.game).to be_nil
         end
       end
 
@@ -718,7 +626,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "converts it to nil" do
-          game.person_id.should be_nil
+          expect(game.person_id).to be_nil
         end
       end
     end
@@ -740,7 +648,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "converts it to nil" do
-          post.person.should be_nil
+          expect(post.person).to be_nil
         end
       end
 
@@ -755,7 +663,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "ignore blank values" do
-          person.post_ids.should be_empty
+          expect(person.post_ids).to be_empty
         end
       end
     end
@@ -773,7 +681,7 @@ describe Mongoid::Relations::Accessors do
         end
 
         it "does not add them" do
-          person.preference_ids.should be_empty
+          expect(person.preference_ids).to be_empty
         end
       end
     end

data/spec/mongoid/relations/auto_save_spec.rb

@@ -5,7 +5,6 @@ describe Mongoid::Relations::AutoSave do
   describe ".auto_save" do
 
     before(:all) do
-      Person.autosaved_relations.delete_one(:account)
       Person.autosave(Person.relations["account"].merge!(autosave: true))
     end
 
@@ -34,7 +33,7 @@ describe Mongoid::Relations::AutoSave do
         end
 
         it "does not save the relation" do
-          game.should_not be_persisted
+          expect(game).to_not be_persisted
         end
       end
     end
@@ -48,7 +47,6 @@ describe Mongoid::Relations::AutoSave do
         end
 
         before do
-          Person.autosaved_relations.delete_one(:drugs)
           Person.autosave(metadata)
           Person.autosave(metadata)
         end
@@ -58,7 +56,7 @@ describe Mongoid::Relations::AutoSave do
         end
 
         it "does not add the autosave callback twice" do
-          drug.should_receive(:save).once
+          expect(drug).to receive(:save).once
           person.drugs.push(drug)
           person.save
         end
@@ -78,7 +76,7 @@ describe Mongoid::Relations::AutoSave do
           end
 
           it "saves the relation" do
-            drug.should be_persisted
+            expect(drug).to be_persisted
           end
         end
 
@@ -91,7 +89,7 @@ describe Mongoid::Relations::AutoSave do
           end
 
           it "saves the relation" do
-            drug.should be_persisted
+            expect(drug).to be_persisted
           end
         end
 
@@ -108,7 +106,7 @@ describe Mongoid::Relations::AutoSave do
 
           it 'does not load the association' do
             from_db.save
-            from_db.ivar(:drugs).should be_false
+            expect(from_db.ivar(:drugs)).to be false
           end
         end
       end
@@ -127,7 +125,11 @@ describe Mongoid::Relations::AutoSave do
           end
 
           it "saves the relation" do
-            account.should be_persisted
+            expect(account).to be_persisted
+          end
+
+          it "persists on the database" do
+            expect(account.reload).to_not be_nil
           end
         end
 
@@ -140,7 +142,26 @@ describe Mongoid::Relations::AutoSave do
           end
 
           it "saves the relation" do
-            account.should be_persisted
+            expect(account).to be_persisted
+          end
+
+          it "persists on the database" do
+            expect(account.reload).to_not be_nil
+          end
+        end
+
+        context "when updating the child" do
+
+          before do
+            person.account = account
+            person.save
+          end
+
+          it "sends one insert" do
+            account.name = "account"
+            expect_query(1) do
+              person.with(write: {w:0}).save
+            end
           end
         end
 
@@ -157,7 +178,7 @@ describe Mongoid::Relations::AutoSave do
 
           it 'does not load the association' do
             from_db.save
-            from_db.ivar(:account).should be_false
+            expect(from_db.ivar(:account)).to be false
           end
         end
       end
@@ -180,7 +201,7 @@ describe Mongoid::Relations::AutoSave do
           end
 
           it "saves the relation" do
-            movie.should be_persisted
+            expect(movie).to be_persisted
           end
         end
 
@@ -193,7 +214,7 @@ describe Mongoid::Relations::AutoSave do
           end
 
           it "saves the relation" do
-            movie.should be_persisted
+            expect(movie).to be_persisted
           end
         end
       end
@@ -201,7 +222,6 @@ describe Mongoid::Relations::AutoSave do
       context "when it has two ralations with autosaves" do
 
         before do
-          Person.autosaved_relations.delete_one(:drugs)
           Person.autosave(Person.relations["drugs"].merge!(autosave: true))
         end
 
@@ -233,11 +253,11 @@ describe Mongoid::Relations::AutoSave do
           end
 
           it 'loads the updated association' do
-            from_db.ivar(:drugs).should be_true
+            expect(from_db.ivar(:drugs)).to eq([placebo])
           end
 
           it 'doest not load the other association' do
-            from_db.ivar(:account).should be_false
+            expect(from_db.ivar(:account)).to be false
           end
         end
 
@@ -248,11 +268,11 @@ describe Mongoid::Relations::AutoSave do
           end
 
           it 'doest not load drugs association' do
-            from_db.ivar(:drugs).should be_false
+            expect(from_db.ivar(:drugs)).to be false
           end
 
           it 'doest not load account association' do
-            from_db.ivar(:account).should be_false
+            expect(from_db.ivar(:account)).to be false
           end
         end
       end