mongoid 6.4.8 → 7.0.0.beta

data/spec/mongoid/{relations → association}/reflections_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Reflections do
+describe Mongoid::Association::Reflections do
 
   class TestClass
     include Mongoid::Document
@@ -20,17 +20,6 @@ describe Mongoid::Relations::Reflections do
       klass.embeds_many(:addresses)
     end
 
-    context "when the name exists" do
-
-      let(:relation) do
-        klass.reflect_on_association(:addresses)
-      end
-
-      it "returns the association metadata" do
-        expect(relation.macro).to eq(:embeds_many)
-      end
-    end
-
     context "when the name does not exist" do
 
       let(:relation) do

data/spec/mongoid/{relations/synchronization_spec.rb → association/syncable_spec.rb}

@@ -1,10 +1,12 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Synchronization do
+describe "Syncable Association" do
 
   before(:all) do
     Mongoid.raise_not_found_error = true
     Person._synced(Person.relations["preferences"])
+    Person.has_and_belongs_to_many :preferences
+    Preference.has_and_belongs_to_many :people
   end
 
   after(:all) do
@@ -27,7 +29,7 @@ describe Mongoid::Relations::Synchronization do
         field :_synced?
       end
     end
-    
+
     let(:model_syncable?) do
       class TestModel
         include Mongoid::Document

data/spec/mongoid/{relations → association}/touchable_spec.rb

@@ -1,11 +1,15 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Touchable do
+describe Mongoid::Association::Touchable do
 
   describe "#touch" do
 
     context "when the document is embedded" do
 
+      before do
+        Label.send(:include, Mongoid::Association::Touchable::InstanceMethods)
+      end
+
       let(:band) do
         Band.create(name: "Placebo")
       end
@@ -29,6 +33,11 @@ describe Mongoid::Relations::Touchable do
 
     context "when no relations have touch options" do
 
+      before do
+        Person.send(:include, Mongoid::Association::Touchable::InstanceMethods)
+        Agent.send(:include, Mongoid::Association::Touchable::InstanceMethods)
+      end
+
       context "when no updated at is defined" do
 
         let(:person) do
@@ -209,6 +218,11 @@ describe Mongoid::Relations::Touchable do
 
       context "when the relation is a parent of an embedded doc" do
 
+        before do
+          Page.send(:include, Mongoid::Association::Touchable::InstanceMethods)
+          Edit.send(:include, Mongoid::Association::Touchable::InstanceMethods)
+        end
+
         let(:page) do
           WikiPage.create(title: "test")
         end
@@ -229,6 +243,10 @@ describe Mongoid::Relations::Touchable do
 
       context "when the parent of embedded doc has cascade callbacks" do
 
+        before do
+          Band.send(:include, Mongoid::Association::Touchable::InstanceMethods)
+        end
+
         let!(:book) do
           Book.new
         end

data/spec/mongoid/{relations_spec.rb → association_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations do
+describe Mongoid::Association do
 
   before(:all) do
     Person.field(

data/spec/mongoid/atomic/modifiers_spec.rb

@@ -211,10 +211,10 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers" do
           expect(modifiers).to eq(
-            { "$push" =>
-                { "addresses" => { '$each' => [
+            { "$pushAll" =>
+              { "addresses" => [
                   { "street" => "Oxford St" }
-                ] }
+                ]
               }
             }
           )
@@ -238,11 +238,11 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers" do
           expect(modifiers).to eq(
-            { "$push" =>
-              { "addresses" => { '$each' => [
+            { "$pushAll" =>
+              { "addresses" => [
                   { "street" => "Hobrechtstr." },
                   { "street" => "Pflugerstr." }
-                ] }
+                ]
               }
             }
           )
@@ -270,10 +270,10 @@ describe Mongoid::Atomic::Modifiers do
         it "adds the push all modifiers to the conflicts hash" do
           expect(modifiers).to eq(
             { "$set" => { "addresses.0.street" => "Bond" },
-              conflicts: { "$push" =>
-                { "addresses" => { '$each' => [
+              conflicts: { "$pushAll" =>
+                { "addresses" => [
                     { "street" => "Oxford St" }
-                  ] }
+                  ]
                 }
               }
             }
@@ -300,10 +300,10 @@ describe Mongoid::Atomic::Modifiers do
           expect(modifiers).to eq(
             { "$pullAll" => {
               "addresses" => { "street" => "Bond St" }},
-              conflicts: { "$push" =>
-                { "addresses" => { '$each' => [
+              conflicts: { "$pushAll" =>
+                { "addresses" => [
                     { "street" => "Oxford St" }
-                  ] }
+                  ]
                 }
               }
             }
@@ -328,12 +328,12 @@ describe Mongoid::Atomic::Modifiers do
 
         it "adds the push all modifiers to the conflicts hash" do
           expect(modifiers).to eq(
-            { "$push" => {
-              "addresses.0.locations" => { '$each' => [{ "street" => "Bond St" }] } },
-              conflicts: { "$push" =>
-                { "addresses" => { '$each' => [
+            { "$pushAll" => {
+              "addresses.0.locations" => [{ "street" => "Bond St" }]},
+              conflicts: { "$pushAll" =>
+                { "addresses" => [
                     { "street" => "Oxford St" }
-                  ] }
+                  ]
                 }
               }
             }

data/spec/mongoid/atomic_spec.rb

@@ -76,13 +76,13 @@ describe Mongoid::Atomic do
             person.addresses.build(street: "Oxford St")
           end
 
-          it "returns a $set and $push for modifications" do
+          it "returns a $set and $pushAll for modifications" do
             expect(person.atomic_updates).to eq(
               {
                 "$set" => { "title" => "Sir" },
-                "$push" => { "addresses" => { '$each' => [
+                "$pushAll" => { "addresses" => [
                     { "_id" => "oxford-st", "street" => "Oxford St" }
-                  ]} }
+                  ]}
               }
             )
           end
@@ -197,8 +197,8 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$push" => {
-                        "addresses.0.locations" => { '$each' => [{ "_id" => location.id, "name" => "Home" }] }
+                      "$pushAll" => {
+                        "addresses.0.locations" => [{ "_id" => location.id, "name" => "Home" }]
                       }
                     }
                   }
@@ -215,8 +215,8 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$push" => {
-                        "addresses.0.locations" => { '$each' => [{ "_id" => location.id, "name" => "Home" }] }
+                      "$pushAll" => {
+                        "addresses.0.locations" => [{ "_id" => location.id, "name" => "Home" }]
                       }
                     }
                   }
@@ -263,15 +263,15 @@ describe Mongoid::Atomic do
                       "addresses.0.street" => "Bond St"
                     },
                     conflicts: {
-                      "$push" => {
-                        "addresses" => { '$each' => [{
+                      "$pushAll" => {
+                        "addresses" => [{
                           "_id" => new_address.id,
                           "street" => "Another",
                           "locations" => [
                             "_id" => location.id,
                             "name" => "Home"
                           ]
-                        }] }
+                        }]
                       }
                     }
                   }
@@ -310,15 +310,15 @@ describe Mongoid::Atomic do
                   "$set" => {
                     "title" => "Sir"
                   },
-                  "$push" => {
-                    "addresses" => { '$each' => [{
+                  "$pushAll" => {
+                    "addresses" => [{
                       "_id" => new_address.id,
                       "street" => "Ipanema",
                       "locations" => [
                         "_id" => location.id,
                         "name" => "Home"
                       ]
-                    }] }
+                    }]
                   },
                   conflicts: {
                     "$set" => { "addresses.0.street"=>"Bond St" }
@@ -339,21 +339,21 @@ describe Mongoid::Atomic do
             address.locations.build(name: "Home")
           end
 
-          it "returns the proper $sets and $pushes for all levels" do
+          it "returns the proper $sets and $pushAlls for all levels" do
             expect(person.atomic_updates).to eq(
               {
                 "$set" => {
                   "title" => "Sir",
                 },
-                "$push" => {
-                  "addresses" => { '$each' => [{
+                "$pushAll" => {
+                  "addresses" => [{
                     "_id" => address.id,
                     "street" => "Another",
                     "locations" => [
                       "_id" => location.id,
                       "name" => "Home"
                     ]
-                  }] }
+                  }]
                 }
               }
             )

data/spec/mongoid/attributes/nested_spec.rb

@@ -41,12 +41,12 @@ describe Mongoid::Attributes::Nested do
         Account.nested_attributes.clear
       end
 
-      let(:metadata) do
+      let(:association) do
         Account.reflect_on_association(:alerts)
       end
 
       it "keeps autosave set to false" do
-        expect(metadata).to_not be_autosave
+        expect(association).to_not be_autosave
       end
     end
   end
@@ -205,10 +205,6 @@ describe Mongoid::Attributes::Nested do
         Post.accepts_nested_attributes_for :person
       end
 
-      after do
-        Post.reset_callbacks(:save)
-      end
-
       let(:post) do
         Post.new(person_attributes: { title: "Sir" })
       end
@@ -4381,12 +4377,11 @@ describe Mongoid::Attributes::Nested do
 
     context "when nesting multiple levels and parent is timestamped" do
 
-      before do
-        class Address
-          after_save do
-            addressable.touch
-          end
-        end
+      around do |example|
+        original_relations = Location.relations
+        Location.embedded_in :address, touch: true
+        example.run
+        Location.relations = original_relations
       end
 
       after do
@@ -4766,6 +4761,13 @@ describe Mongoid::Attributes::Nested do
           user.update_attributes(params)
         end
 
+        around do |example|
+          original_relations = User.relations
+          User.has_many :posts, foreign_key: :author_id, validate: false, autosave: true
+          example.run
+          user.relations = original_relations
+        end
+
         let(:post) do
           user.posts.first
         end

data/spec/mongoid/attributes/readonly_spec.rb

@@ -96,30 +96,14 @@ describe Mongoid::Attributes::Readonly do
       context "when updating via the setter" do
 
         it "does not update the first field" do
-          expect {
-            person.title = 'mr'
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.title).to eq("sir")
-        end
-
-        it "does not update the second field" do
-          expect {
-            person.aliased_timestamp = Time.at(43)
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.aliased_timestamp).to eq(Time.at(42))
-        end
-
-        it "does not persist the first field" do
-          expect {
-            person.title = 'mr'
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+          person.title = 'mr'
+          person.save
           expect(person.reload.title).to eq("sir")
         end
 
-        it "does not persist the second field" do
-          expect {
-            person.aliased_timestamp = Time.at(43)
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+        it "does not update the second field" do
+          person.aliased_timestamp = Time.at(43)
+          person.save
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
@@ -128,19 +112,20 @@ describe Mongoid::Attributes::Readonly do
 
         context 'with single field operation' do
 
-          it "raises an error " do
-            expect {
-              person.inc(score: 1)
-            }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          it "updates the field" do
+            person.inc(score: 1)
+            person.save
+            expect(person.reload.score).to eq(2)
           end
         end
 
         context 'with multiple fields operation' do
 
-          it "raises an error " do
-            expect {
-              person.inc(score: 1, age: 1)
-            }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          it "updates the fields" do
+            person.inc(score: 1, age: 1)
+            person.save
+            expect(person.reload.score).to eq(2)
+            expect(person.reload.age).to eq(101)
           end
         end
       end
@@ -149,21 +134,20 @@ describe Mongoid::Attributes::Readonly do
 
         context 'with single field operation' do
 
-          it "raises an error " do
-            expect {
-              person.bit(score: { or: 13 })
-            }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          it "does the update" do
+            person.bit(score: { or: 13 })
+            person.save
+            expect(person.reload.score).to eq(13)
           end
         end
 
         context 'with multiple fields operation' do
 
-          it "raises an error " do
-            expect {
-              person.bit(
-                age: { and: 13 }, score: { or: 13 }, inte: { and: 13, or: 10 }
-              )
-            }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          it "udpates the attribute" do
+            person.bit(age: {and: 13}, score: {or: 13})
+            person.save
+            expect(person.reload.score).to eq(13)
+            expect(person.reload.age).to eq(4)
           end
         end
       end
@@ -171,30 +155,14 @@ describe Mongoid::Attributes::Readonly do
       context "when updating via []=" do
 
         it "does not update the first field" do
-          expect {
-            person[:title] = "mr"
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.title).to eq("sir")
-        end
-
-        it "does not update the second field" do
-          expect {
-            person[:aliased_timestamp] = Time.at(43)
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.aliased_timestamp).to eq(Time.at(42))
-        end
-
-        it "does not persist the first field" do
-          expect {
-            person[:title] = "mr"
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+          person[:title] = "mr"
+          person.save
           expect(person.reload.title).to eq("sir")
         end
 
-        it "does not persist the second field" do
-          expect {
-            person[:aliased_timestamp] = Time.at(43)
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+        it "does not update the second field" do
+          person[:aliased_timestamp] = Time.at(43)
+          person.save
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
@@ -202,30 +170,14 @@ describe Mongoid::Attributes::Readonly do
       context "when updating via write_attribute" do
 
         it "does not update the first field" do
-          expect {
-            person.write_attribute(:title, "mr")
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.title).to eq("sir")
-        end
-
-        it "does not update the second field" do
-          expect {
-            person.write_attribute(:aliased_timestamp, Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.aliased_timestamp).to eq(Time.at(42))
-        end
-
-        it "does not persist the first field" do
-          expect {
-            person.write_attribute(:title, "mr")
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+          person.write_attribute(:title, "mr")
+          person.save
           expect(person.reload.title).to eq("sir")
         end
 
-        it "does not persist the second field" do
-          expect {
-            person.write_attribute(:aliased_timestamp, Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+        it "does not update the second field" do
+          person.write_attribute(:aliased_timestamp, Time.at(43))
+          person.save
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
@@ -233,30 +185,14 @@ describe Mongoid::Attributes::Readonly do
       context "when updating via update_attributes" do
 
         it "does not update the first field" do
-          expect {
-            person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.title).to eq("sir")
-        end
-
-        it "does not update the second field" do
-          expect {
-            person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.aliased_timestamp).to eq(Time.at(42))
-        end
-
-        it "does not persist the first field" do
-          expect {
-            person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+          person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
+          person.save
           expect(person.reload.title).to eq("sir")
         end
 
-        it "does not persist the second field" do
-          expect {
-            person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+        it "does not update the second field" do
+          person.update_attributes(title: "mr", aliased_timestamp: Time.at(43))
+          person.save
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
@@ -264,30 +200,14 @@ describe Mongoid::Attributes::Readonly do
       context "when updating via update_attributes!" do
 
         it "does not update the first field" do
-          expect {
-            person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.title).to eq("sir")
-        end
-
-        it "does not update the second field" do
-          expect {
-            person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
-          expect(person.aliased_timestamp).to eq(Time.at(42))
-        end
-
-        it "does not persist the first field" do
-          expect {
-            person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+          person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
+          person.save
           expect(person.reload.title).to eq("sir")
         end
 
-        it "does not persist the second field" do
-          expect {
-            person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
-          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
+        it "does not update the second field" do
+          person.update_attributes!(title: "mr", aliased_timestamp: Time.at(43))
+          person.save
           expect(person.reload.aliased_timestamp).to eq(Time.at(42))
         end
       end
@@ -297,7 +217,7 @@ describe Mongoid::Attributes::Readonly do
         it "raises an error" do
           expect {
             person.update_attribute(:title, "mr")
-          }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
         end
       end
 
@@ -306,9 +226,44 @@ describe Mongoid::Attributes::Readonly do
         it "raises an error" do
           expect {
             person.remove_attribute(:title)
-          }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          }.to raise_exception(Mongoid::Errors::ReadonlyAttribute)
         end
       end
     end
+
+    context 'when a foreign_key is defined as readonly' do
+
+      let(:attributes) do
+        :mother_id
+      end
+
+      context 'when the relation exists' do
+
+        let(:mother) do
+          Person.create
+        end
+
+        let(:child) do
+          Person.create(mother: mother)
+          Person.find_by(mother: mother)
+        end
+
+        it 'the relation can still be accessed' do
+          expect(child.mother).to eq(mother)
+        end
+      end
+
+      context 'when the relation does not exist' do
+
+        let(:child) do
+          Person.create
+        end
+
+        it 'the relation is nil' do
+          expect(child.mother).to be_nil
+        end
+      end
+
+    end
   end
 end