mongoid 8.0.6 → 8.1.0

data/spec/mongoid/association/embedded/embedded_in/proxy_spec.rb

@@ -616,4 +616,31 @@ describe Mongoid::Association::Embedded::EmbeddedIn::Proxy do
       end
     end
   end
+
+  context "when assigning a hash" do
+    let(:building_address) { BuildingAddress.new }
+
+    before do
+      building_address.building = { name: "Chrysler" }
+    end
+
+    it "creates the objects correctly" do
+      expect(building_address.building).to be_a(Building)
+      expect(building_address.building.name).to eq("Chrysler")
+    end
+  end
+
+  context "when replacing an association with a hash" do
+    let(:building_address) { BuildingAddress.new }
+
+    before do
+      building_address.building = { name: "Chrysler" }
+      building_address.building = { name: "Empire State" }
+    end
+
+    it "creates the objects correctly" do
+      expect(building_address.building).to be_a(Building)
+      expect(building_address.building.name).to eq("Empire State")
+    end
+  end
 end

data/spec/mongoid/association/embedded/embeds_many/proxy_spec.rb

@@ -2357,10 +2357,7 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
       context "when the id does not match" do
 
         context "when config set to raise error" do
-
-          before do
-            Mongoid.raise_not_found_error = true
-          end
+          config_override :raise_not_found_error, true
 
           it "raises an error" do
             expect {
@@ -2370,19 +2367,12 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
         end
 
         context "when config set not to raise error" do
+          config_override :raise_not_found_error, false
 
           let(:address) do
             person.addresses.find(BSON::ObjectId.new)
           end
 
-          before do
-            Mongoid.raise_not_found_error = false
-          end
-
-          after do
-            Mongoid.raise_not_found_error = true
-          end
-
           it "returns nil" do
             expect(address).to be_nil
           end
@@ -2406,10 +2396,7 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
       context "when the ids do not match" do
 
         context "when config set to raise error" do
-
-          before do
-            Mongoid.raise_not_found_error = true
-          end
+          config_override :raise_not_found_error, true
 
           it "raises an error" do
             expect {
@@ -2419,19 +2406,12 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
         end
 
         context "when config set not to raise error" do
+          config_override :raise_not_found_error, false
 
           let(:addresses) do
             person.addresses.find([ BSON::ObjectId.new ])
           end
 
-          before do
-            Mongoid.raise_not_found_error = false
-          end
-
-          after do
-            Mongoid.raise_not_found_error = true
-          end
-
           it "returns an empty array" do
             expect(addresses).to be_empty
           end
@@ -4591,7 +4571,7 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
     before do
       band.collection.
           find(_id: band.id).
-          update_one("$set" => { records: [{ name: "Moderat" }]})
+          update_one("$set" => { records: [{ _id: BSON::ObjectId.new, name: "Moderat" }]})
     end
 
     context "when loading the documents" do
@@ -4865,4 +4845,19 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
       expect(from_db.company_tags.size).to eq(2)
     end
   end
+
+  context "when assigning hashes" do
+    let(:user) { EmmUser.create! }
+
+    before do
+      user.orders = [ { sku: 1 }, { sku: 2 } ]
+    end
+
+    it "creates the objects correctly" do
+      expect(user.orders.first).to be_a(EmmOrder)
+      expect(user.orders.last).to be_a(EmmOrder)
+
+      expect(user.orders.map(&:sku).sort).to eq([ 1, 2 ])
+    end
+  end
 end

data/spec/mongoid/association/embedded/embeds_many_models.rb

@@ -100,6 +100,7 @@ end
 class EmmOrder
   include Mongoid::Document
 
+  field :sku
   field :amount, type: Integer
 
   embedded_in :user, class_name: 'EmmUser'

data/spec/mongoid/association/embedded/embeds_one/proxy_spec.rb

@@ -202,7 +202,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
             end
           end
         end
-        
+
         context 'when the original document does not need to be unset because it will be replaced by the $set' do
 
           let!(:pet_owner) do
@@ -971,7 +971,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
     before do
       band.collection.
           find(_id: band.id).
-          update_one("$set" => { label: { name: "Mute" }})
+          update_one("$set" => { label: { _id: BSON::ObjectId.new, name: "Mute" }})
     end
 
     context "when loading the documents" do
@@ -1022,4 +1022,17 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       expect(building.building_address).to be_a(BuildingAddress)
     end
   end
+
+  context "when assigning a hash" do
+    let(:building) { Building.create! }
+
+    before do
+      building.building_address = { city: "NYC" }
+    end
+
+    it "creates the objects correctly" do
+      expect(building.building_address).to be_a(BuildingAddress)
+      expect(building.building_address.city).to eq("NYC")
+    end
+  end
 end

data/spec/mongoid/association/referenced/belongs_to_spec.rb

@@ -546,17 +546,7 @@ describe Mongoid::Association::Referenced::BelongsTo do
       end
 
       context 'when the global config option is true' do
-
-        around(:example) do |example|
-          original_config = Mongoid.belongs_to_required_by_default
-          Mongoid.belongs_to_required_by_default = true
-          example.run
-          Mongoid.belongs_to_required_by_default = original_config
-        end
-
-        let!(:original_required_config) do
-          Mongoid.belongs_to_required_by_default
-        end
+        config_override :belongs_to_required_by_default, true
 
         context 'when the required option is true' do
 
@@ -684,13 +674,7 @@ describe Mongoid::Association::Referenced::BelongsTo do
       end
 
       context 'when the global config option is false' do
-
-        around(:example) do |example|
-          original_config = Mongoid.belongs_to_required_by_default
-          Mongoid.belongs_to_required_by_default = false
-          example.run
-          Mongoid.belongs_to_required_by_default = original_config
-        end
+        config_override :belongs_to_required_by_default, false
 
         context 'when the required option is true' do
 

data/spec/mongoid/association/referenced/has_and_belongs_to_many/proxy_spec.rb

@@ -4,14 +4,12 @@ require "spec_helper"
 require_relative "../has_and_belongs_to_many_models"
 
 describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
+  config_override :raise_not_found_error, true
 
   around(:each) do |example|
-    original_raise_not_found_error = Mongoid.raise_not_found_error
     original_preferences_association = Person.relations["preferences"]
-    Mongoid.raise_not_found_error = true
     Person.has_and_belongs_to_many :preferences, autosave: true
     example.run
-    Mongoid.raise_not_found_error = original_raise_not_found_error
     Person.relations["preferences"] = original_preferences_association
   end
 
@@ -2469,10 +2467,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
         context "when the id does not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
@@ -2482,19 +2477,12 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:preference) do
               person.preferences.find(BSON::ObjectId.new)
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns nil" do
               expect(preference).to be_nil
             end
@@ -2533,10 +2521,7 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
         context "when the ids do not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
@@ -2546,19 +2531,12 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:preferences) do
               person.preferences.find([ BSON::ObjectId.new ])
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns an empty array" do
               expect(preferences).to be_empty
             end

data/spec/mongoid/association/referenced/has_many/proxy_spec.rb

@@ -23,10 +23,9 @@ module RefHasManySpec
 end
 
 describe Mongoid::Association::Referenced::HasMany::Proxy do
+  config_override :raise_not_found_error, true
 
   before :all do
-    Mongoid.raise_not_found_error = true
-
     Drug.belongs_to :person, primary_key: :username
     Person.has_many :drugs, validate: false, primary_key: :username
   end
@@ -2535,10 +2534,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the id does not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
@@ -2548,19 +2544,12 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:post) do
               person.posts.find(BSON::ObjectId.new)
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns nil" do
               expect(post).to be_nil
             end
@@ -2584,10 +2573,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the ids do not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
@@ -2597,19 +2583,12 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:posts) do
               person.posts.find([ BSON::ObjectId.new ])
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns an empty array" do
               expect(posts).to be_empty
             end
@@ -2648,10 +2627,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the id does not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
@@ -2661,19 +2637,12 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:rating) do
               movie.ratings.find(BSON::ObjectId.new)
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns nil" do
               expect(rating).to be_nil
             end
@@ -2705,10 +2674,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the ids do not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
@@ -2718,19 +2684,12 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:ratings) do
               movie.ratings.find([ BSON::ObjectId.new ])
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns an empty array" do
               expect(ratings).to be_empty
             end

data/spec/mongoid/association/syncable_spec.rb

@@ -3,9 +3,9 @@
 require "spec_helper"
 
 describe "Syncable Association" do
+  config_override :raise_not_found_error, true
 
   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

data/spec/mongoid/attributes_spec.rb

@@ -393,11 +393,10 @@ describe Mongoid::Attributes do
         end
 
         context "when reloaded" do
+          config_override :raise_not_found_error, false
 
           before do
-            Mongoid.raise_not_found_error = false
             person.reload
-            Mongoid.raise_not_found_error = true
           end
 
           it "returns the default value" do
@@ -1030,14 +1029,13 @@ describe Mongoid::Attributes do
       end
 
       context "when the attribute does not exist" do
+        config_override :raise_not_found_error, false
 
         before do
           person.collection
             .find({ _id: person.id })
             .update_one({ "$unset" => { age: 1 }})
-          Mongoid.raise_not_found_error = false
           person.reload
-          Mongoid.raise_not_found_error = true
         end
 
         it "returns the default value" do
@@ -1161,14 +1159,13 @@ describe Mongoid::Attributes do
       end
 
       context "when the attribute does not exist" do
+        config_override :raise_not_found_error, false
 
         before do
           person.collection
             .find({ _id: person.id })
             .update_one({ "$unset" => { age: 1 }})
-          Mongoid.raise_not_found_error = false
           person.reload
-          Mongoid.raise_not_found_error = true
         end
 
         it "returns true" do
@@ -2711,31 +2708,4 @@ describe Mongoid::Attributes do
       catalog.set_field.should == Set.new([ 1, 2 ])
     end
   end
-
-  context 'when an embedded field has a capitalized store_as name' do
-    let(:person) { Person.new(Purse: { brand: 'Gucci' }) }
-
-    it 'sets the value' do
-      expect(person.purse.brand).to eq('Gucci')
-    end
-
-    it 'saves successfully' do
-      expect(person.save!).to eq(true)
-    end
-
-    context 'when persisted' do
-      before do
-        person.save!
-        person.reload
-      end
-
-      it 'persists the value' do
-        expect(person.reload.purse.brand).to eq('Gucci')
-      end
-
-      it 'uses the correct key in the database' do
-        expect(person.collection.find(_id: person.id).first['Purse']['_id']).to eq(person.purse.id)
-      end
-    end
-  end
 end