mongoid 6.4.8 → 7.0.0.beta

data/spec/mongoid/{relations/bindings/embedded/many_spec.rb → association/embedded/embeds_many/binding_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Bindings::Embedded::Many do
+describe Mongoid::Association::Embedded::EmbedsMany::Binding do
 
   let(:person) do
     Person.new
@@ -14,14 +14,14 @@ describe Mongoid::Relations::Bindings::Embedded::Many do
     [ address ]
   end
 
-  let(:metadata) do
+  let(:association) do
     Person.relations["addresses"]
   end
 
   describe "#bind_one" do
 
     let(:binding) do
-      described_class.new(person, target, metadata)
+      described_class.new(person, target, association)
     end
 
     context "when the document is bindable" do

data/spec/mongoid/{relations/builders/embedded/many_spec.rb → association/embedded/embeds_many/buildable_spec.rb}

@@ -1,31 +1,31 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Builders::Embedded::Many do
+describe Mongoid::Association::Embedded::EmbedsMany::Buildable do
 
   let(:base) do
     double
   end
 
-  let(:builder) do
-    described_class.new(base, metadata, object)
+  let(:options) do
+    { }
   end
 
   describe "#build" do
 
-    context "when passed an array of documents" do
+    let(:documents) do
+      association.build(base, object)
+    end
 
-      let(:metadata) do
-        double(klass: Address, name: :addresses)
-      end
+    let(:association) do
+      Mongoid::Association::Embedded::EmbedsMany.new(Person, :addresses, options)
+    end
+
+    context "when passed an array of documents" do
 
       let(:object) do
         [ Address.new(city: "London") ]
       end
 
-      let(:documents) do
-        builder.build
-      end
-
       it "returns an array of documents" do
         expect(documents).to eq(object)
       end
@@ -33,18 +33,10 @@ describe Mongoid::Relations::Builders::Embedded::Many do
 
     context "when the array is empty" do
 
-      let(:metadata) do
-        double(klass: Address, name: :addresses)
-      end
-
       let(:object) do
         []
       end
 
-      let(:documents) do
-        builder.build
-      end
-
       it "returns an empty array" do
         expect(documents).to eq(object)
       end
@@ -52,16 +44,8 @@ describe Mongoid::Relations::Builders::Embedded::Many do
 
     context "when passed nil" do
 
-      let(:metadata) do
-        double(klass: Address, name: :addresses)
-      end
-
-      let(:builder) do
-        described_class.new(nil, metadata, nil)
-      end
-
-      let(:documents) do
-        builder.build
+      let(:object) do
+        nil
       end
 
       it "returns an empty array" do
@@ -71,18 +55,10 @@ describe Mongoid::Relations::Builders::Embedded::Many do
 
     context "when no type is in the object" do
 
-      let(:metadata) do
-        double(klass: Address, name: :addresses)
-      end
-
       let(:object) do
         [ { "city" => "London" }, { "city" => "Shanghai" } ]
       end
 
-      let(:documents) do
-        builder.build
-      end
-
       it "returns an array of documents" do
         expect(documents).to be_a_kind_of(Array)
       end
@@ -99,21 +75,17 @@ describe Mongoid::Relations::Builders::Embedded::Many do
 
     context "when a type is in the object" do
 
-      let(:metadata) do
-        double(klass: Shape, name: :shapes)
+      let(:association) do
+        Mongoid::Association::Embedded::EmbedsMany.new(Person, :shapes)
       end
 
       let(:object) do
         [
-          { "_type" => "Circle", "radius" => 100 },
-          { "_type" => "Square", "width" => 50 }
+            { "_type" => "Circle", "radius" => 100 },
+            { "_type" => "Square", "width" => 50 }
         ]
       end
 
-      let(:documents) do
-        builder.build
-      end
-
       it "returns an array of documents" do
         expect(documents).to be_a_kind_of(Array)
       end

data/spec/mongoid/{relations/embedded/many_spec.rb → association/embedded/embeds_many/proxy_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Relations::Embedded::Many do
+describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
 
   [ :<<, :push ].each do |method|
 
@@ -40,8 +40,8 @@ describe Mongoid::Relations::Embedded::Many do
           expect(address._parent).to eq(person)
         end
 
-        it "sets the metadata on the child" do
-          expect(address.__metadata).to_not be_nil
+        it "sets the association metadata on the child" do
+          expect(address._association).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -52,6 +52,21 @@ describe Mongoid::Relations::Embedded::Many do
           expect(added).to eq(person.addresses)
         end
 
+        context 'when the child is already related to the parent' do
+
+          let(:message) do
+            Message.new(person: person)
+          end
+
+          before do
+            person.messages << message
+          end
+
+          it "appends only once to the target" do
+            expect(person.messages).to eq([ message ])
+          end
+        end
+
         context "with a limiting default scope" do
 
           context "when the document matches the scope" do
@@ -65,7 +80,7 @@ describe Mongoid::Relations::Embedded::Many do
             end
 
             it "appends to the target" do
-              expect(person.appointments.target).to eq([ active ])
+              expect(person.appointments._target).to eq([ active ])
             end
 
             it "appends to the _unscoped" do
@@ -84,7 +99,7 @@ describe Mongoid::Relations::Embedded::Many do
             end
 
             it "doesn't append to the target" do
-              expect(person.appointments.target).to_not eq([ inactive ])
+              expect(person.appointments._target).to_not eq([ inactive ])
             end
 
             it "appends to the _unscoped" do
@@ -180,8 +195,8 @@ describe Mongoid::Relations::Embedded::Many do
             expect(child_role._parent).to eq(parent_role)
           end
 
-          it "sets the metadata on the child" do
-            expect(child_role.__metadata).to_not be_nil
+          it "sets the association metadata on the child" do
+            expect(child_role._association).to_not be_nil
           end
 
           it "sets the index on the child" do
@@ -221,21 +236,21 @@ describe Mongoid::Relations::Embedded::Many do
         context "assign parent first" do
           before do
             message.person = person
-            message.receviers.send(method, person)
+            message.receivers.send(method, person)
           end
 
           it "appends to the relation array" do
-            expect(message.receviers).to include(person)
+            expect(message.receivers).to include(person)
           end
         end
 
         context "not assign parent" do
           before do
-            message.receviers.send(method, person)
+            message.receivers.send(method, person)
           end
 
           it "appends to the relation array" do
-            expect(message.receviers).to include(person)
+            expect(message.receivers).to include(person)
           end
         end
       end
@@ -282,8 +297,8 @@ describe Mongoid::Relations::Embedded::Many do
         expect(address._parent).to eq(person)
       end
 
-      it "sets the metadata on the child" do
-        expect(address.__metadata).to_not be_nil
+      it "sets the association metadata on the child" do
+        expect(address._association).to_not be_nil
       end
 
       it "sets the index on the child" do
@@ -433,8 +448,8 @@ describe Mongoid::Relations::Embedded::Many do
 
       let(:addresses) do
         [
-          Address.new(street: "1st St"),
-          Address.new(street: "2nd St")
+            Address.new(street: "1st St"),
+            Address.new(street: "2nd St")
         ]
       end
 
@@ -651,8 +666,8 @@ describe Mongoid::Relations::Embedded::Many do
           expect(child_role._parent).to eq(parent_role)
         end
 
-        it "sets the metadata on the child" do
-          expect(child_role.__metadata).to_not be_nil
+        it "sets the association metadata on the child" do
+          expect(child_role._association).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -1028,8 +1043,8 @@ describe Mongoid::Relations::Embedded::Many do
           expect(address._parent).to eq(person)
         end
 
-        it "sets the metadata on the child" do
-          expect(address.__metadata).to_not be_nil
+        it "sets the association metadata on the child" do
+          expect(address._association).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -1071,8 +1086,8 @@ describe Mongoid::Relations::Embedded::Many do
           expect(child_role._parent).to eq(parent_role)
         end
 
-        it "sets the metadata on the child" do
-          expect(child_role.__metadata).to_not be_nil
+        it "sets the association metadata on the child" do
+          expect(child_role._association).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -1092,9 +1107,9 @@ describe Mongoid::Relations::Embedded::Many do
 
         let(:address) do
           person.addresses.send(
-            method,
-            street: "Bond",
-            locations_attributes: { "1" => { "name" => "Home" } }
+              method,
+              street: "Bond",
+              locations_attributes: { "1" => { "name" => "Home" } }
           )
         end
 
@@ -1116,35 +1131,6 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
-  describe ".builder" do
-
-    let(:base) do
-      Person.new
-    end
-
-    let(:target) do
-      [ address ]
-    end
-
-    let(:metadata) do
-      Person.relations["addresses"]
-    end
-
-    let(:relation) do
-      described_class.new(base, target, metadata)
-    end
-
-    let(:document) do
-      Address.new
-    end
-
-    it "returns the many builder" do
-      expect(
-        described_class.builder(base, metadata, document)
-      ).to be_a(Mongoid::Relations::Builders::Embedded::Many)
-    end
-  end
-
   describe "#clear" do
 
     context "when the parent has been persisted" do
@@ -1260,8 +1246,8 @@ describe Mongoid::Relations::Embedded::Many do
         expect(address._parent).to eq(person)
       end
 
-      it "sets the metadata on the child" do
-        expect(address.__metadata).to_not be_nil
+      it "sets the association metadata on the child" do
+        expect(address._association).to_not be_nil
       end
 
       it "sets the index on the child" do
@@ -1367,8 +1353,8 @@ describe Mongoid::Relations::Embedded::Many do
           expect(child_role._parent).to eq(parent_role)
         end
 
-        it "sets the metadata on the child" do
-          expect(child_role.__metadata).to_not be_nil
+        it "sets the association metadata on the child" do
+          expect(child_role._association).to_not be_nil
         end
 
         it "sets the index on the child" do
@@ -1474,8 +1460,8 @@ describe Mongoid::Relations::Embedded::Many do
         expect(address._parent).to eq(person)
       end
 
-      it "sets the metadata on the child" do
-        expect(address.__metadata).to_not be_nil
+      it "sets the association metadata on the child" do
+        expect(address._association).to_not be_nil
       end
 
       it "sets the index on the child" do
@@ -1573,8 +1559,8 @@ describe Mongoid::Relations::Embedded::Many do
         expect(address._parent).to eq(person)
       end
 
-      it "sets the metadata on the child" do
-        expect(address.__metadata).to_not be_nil
+      it "sets the association metadata on the child" do
+        expect(address._association).to_not be_nil
       end
 
       it "sets the index on the child" do
@@ -1596,10 +1582,10 @@ describe Mongoid::Relations::Embedded::Many do
 
       context 'when the presence of the embedded relation is validated' do
 
-        before do
-          class Book
-            validates :pages, presence: true
-          end
+        around do |example|
+          Book.validates :pages, presence: true
+          example.run
+          Book.reset_callbacks(:validate)
         end
 
         let(:book) do
@@ -1805,8 +1791,8 @@ describe Mongoid::Relations::Embedded::Many do
 
           let!(:deleted) do
             person.addresses.send(
-              method,
-              { street: "Bond" }
+                method,
+                { street: "Bond" }
             )
           end
 
@@ -1853,8 +1839,8 @@ describe Mongoid::Relations::Embedded::Many do
 
           let!(:deleted) do
             person.addresses.send(
-              method,
-              { street: "Bond" }
+                method,
+                { street: "Bond" }
             )
           end
 
@@ -1939,8 +1925,8 @@ describe Mongoid::Relations::Embedded::Many do
 
           let!(:deleted) do
             person.addresses.send(
-              method,
-              conditions: { street: "Bond" }
+                method,
+                conditions: { street: "Bond" }
             )
           end
 
@@ -1986,13 +1972,6 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
-  describe ".foreign_key_suffix" do
-
-    it "returns nil" do
-      expect(described_class.foreign_key_suffix).to be_nil
-    end
-  end
-
   describe "#exists?" do
 
     let!(:person) do
@@ -2177,27 +2156,28 @@ describe Mongoid::Relations::Embedded::Many do
       end
     end
 
-    context "when the child belongs to another document" do
-
-      let(:product) do
-        Product.create
-      end
-
-      let(:purchase) do
-        Purchase.create
-      end
-
-      let(:line_item) do
-        purchase.line_items.find_or_create_by(
-          product_id: product.id,
-          product_type: product.class.name
-        )
-      end
-
-      it "properly creates the document" do
-        expect(line_item.product).to eq(product)
-      end
-    end
+    # todo: why should this pass?
+    # context "when the child belongs to another document" do
+    #
+    #   let(:product) do
+    #     Product.create
+    #   end
+    #
+    #   let(:purchase) do
+    #     Purchase.create
+    #   end
+    #
+    #   let(:line_item) do
+    #     purchase.line_items.find_or_create_by(
+    #         product_id: product.id,
+    #         product_type: product.class.name
+    #     )
+    #   end
+    #
+    #   it "properly creates the document" do
+    #     expect(line_item.product).to eq(product)
+    #   end
+    # end
   end
 
   describe "#find_or_create_by!" do
@@ -2251,27 +2231,28 @@ describe Mongoid::Relations::Embedded::Many do
       end
     end
 
-    context "when the child belongs to another document" do
-
-      let(:product) do
-        Product.create
-      end
-
-      let(:purchase) do
-        Purchase.create
-      end
-
-      let(:line_item) do
-        purchase.line_items.find_or_create_by(
-            product_id: product.id,
-            product_type: product.class.name
-        )
-      end
-
-      it "properly creates the document" do
-        expect(line_item.product).to eq(product)
-      end
-    end
+    # todo: why should this pass?
+    # context "when the child belongs to another document" do
+    #
+    #   let(:product) do
+    #     Product.create
+    #   end
+    #
+    #   let(:purchase) do
+    #     Purchase.create
+    #   end
+    #
+    #   let(:line_item) do
+    #     purchase.line_items.find_or_create_by(
+    #         product_id: product.id,
+    #         product_type: product.class.name
+    #     )
+    #   end
+    #
+    #   it "properly creates the document" do
+    #     expect(line_item.product).to eq(product)
+    #   end
+    # end
   end
 
   describe "#find_or_initialize_by" do
@@ -2317,13 +2298,6 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
-  describe ".macro" do
-
-    it "returns embeds_many" do
-      expect(described_class.macro).to eq(:embeds_many)
-    end
-  end
-
   describe "#max" do
 
     let(:person) do
@@ -2388,17 +2362,17 @@ describe Mongoid::Relations::Embedded::Many do
 
     let!(:address_one) do
       person.addresses.create(
-        street: "Market",
-        state: "CA",
-        services: [ "1", "2" ]
+          street: "Market",
+          state: "CA",
+          services: [ "1", "2" ]
       )
     end
 
     let!(:address_two) do
       person.addresses.create(
-        street: "Madison",
-        state: "NY",
-        services: [ "1", "2" ]
+          street: "Madison",
+          state: "NY",
+          services: [ "1", "2" ]
       )
     end
 
@@ -2527,19 +2501,6 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
-  describe ".nested_builder" do
-
-    let(:metadata) do
-      Person.relations["addresses"]
-    end
-
-    it "returns the many nested builder class" do
-      expect(
-        described_class.nested_builder(metadata, {}, {})
-      ).to be_a(Mongoid::Relations::Builders::NestedAttributes::Many)
-    end
-  end
-
   describe "#pop" do
 
     let(:person) do
@@ -2583,25 +2544,6 @@ describe Mongoid::Relations::Embedded::Many do
         person.addresses.create(street: "hermannstr")
       end
 
-      context "when the number is zero" do
-
-        let!(:popped) do
-          person.addresses.pop(0)
-        end
-
-        it "returns an empty array" do
-          expect(popped).to eq([])
-        end
-
-        it "does not remove the document from the relation" do
-          expect(person.addresses).to eq([ address_one, address_two ])
-        end
-
-        it "does not persist the pop" do
-          expect(person.reload.addresses).to eq([ address_one, address_two ])
-        end
-      end
-
       context "when the number is not larger than the relation" do
 
         let!(:popped) do
@@ -2659,125 +2601,6 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
-  describe "#shift" do
-
-    let(:person) do
-      Person.create
-    end
-
-    context "when no argument is provided" do
-
-      let!(:address_one) do
-        person.addresses.create(street: "sonnenallee")
-      end
-
-      let!(:address_two) do
-        person.addresses.create(street: "hermannstr")
-      end
-
-      let!(:shifted) do
-        person.addresses.shift
-      end
-
-      it "returns the shifted document" do
-        expect(shifted).to eq(address_one)
-      end
-
-      it "removes the document from the relation" do
-        expect(person.addresses).to eq([ address_two ])
-      end
-
-      it "persists the shift" do
-        expect(person.reload.addresses).to eq([ address_two ])
-      end
-    end
-
-    context "when an integer is provided" do
-
-      let!(:address_one) do
-        person.addresses.create(street: "sonnenallee")
-      end
-
-      let!(:address_two) do
-        person.addresses.create(street: "hermannstr")
-      end
-
-      context "when the number is zero" do
-
-        let!(:shifted) do
-          person.addresses.shift(0)
-        end
-
-        it "returns an empty array" do
-          expect(shifted).to eq([])
-        end
-
-        it "does not remove the document from the relation" do
-          expect(person.addresses).to eq([ address_one, address_two ])
-        end
-
-        it "does not persist the shift" do
-          expect(person.reload.addresses).to eq([ address_one, address_two ])
-        end
-      end
-
-      context "when the number is not larger than the relation" do
-
-        let!(:shifted) do
-          person.addresses.shift(2)
-        end
-
-        it "returns the shifted documents" do
-          expect(shifted).to eq([ address_one, address_two ])
-        end
-
-        it "removes the document from the relation" do
-          expect(person.addresses).to be_empty
-        end
-
-        it "persists the shift" do
-          expect(person.reload.addresses).to be_empty
-        end
-      end
-
-      context "when the number is larger than the relation" do
-
-        let!(:shifted) do
-          person.addresses.shift(4)
-        end
-
-        it "returns the shifted documents" do
-          expect(shifted).to eq([ address_one, address_two ])
-        end
-
-        it "removes the document from the relation" do
-          expect(person.addresses).to be_empty
-        end
-
-        it "persists the shift" do
-          expect(person.reload.addresses).to be_empty
-        end
-      end
-    end
-
-    context "when the relation is empty" do
-
-      context "when providing no number" do
-
-        it "returns nil" do
-          expect(person.addresses.shift).to be_nil
-        end
-      end
-
-      context "when providing a number" do
-
-        it "returns nil" do
-          expect(person.addresses.shift(2)).to be_nil
-        end
-      end
-    end
-  end
-
   describe "#scoped" do
 
     let(:person) do
@@ -2817,7 +2640,7 @@ describe Mongoid::Relations::Embedded::Many do
       end
     end
 
-    Mongoid::Relations::Embedded::Many.public_instance_methods.each do |method|
+    Mongoid::Association::Embedded::EmbedsMany::Proxy.public_instance_methods.each do |method|
 
       context "when checking #{method}" do
 
@@ -2911,8 +2734,8 @@ describe Mongoid::Relations::Embedded::Many do
 
         before do
           person.addresses.
-            where(street: "Hobrecht").
-            update_all(number: 26, post_code: "12437")
+              where(street: "Hobrecht").
+              update_all(number: 26, post_code: "12437")
         end
 
         it "resets the matching dirty flags" do
@@ -2934,25 +2757,6 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
-  describe ".valid_options" do
-
-    it "returns the valid options" do
-      expect(described_class.valid_options).to eq(
-        [
-          :as, :cascade_callbacks, :cyclic, :order,
-          :store_as, :before_add, :after_add, :before_remove, :after_remove
-        ]
-      )
-    end
-  end
-
-  describe ".validation_default" do
-
-    it "returns true" do
-      expect(described_class.validation_default).to be true
-    end
-  end
-
   context "when deeply embedding documents" do
 
     context "when updating the bottom level" do
@@ -3823,9 +3627,9 @@ describe Mongoid::Relations::Embedded::Many do
 
     let!(:person) do
       Person.create(
-        addresses: [
-          { locations: [{ name: "home" }]}
-        ]
+          addresses: [
+              { locations: [{ name: "home" }]}
+          ]
       )
     end
 
@@ -3837,9 +3641,9 @@ describe Mongoid::Relations::Embedded::Many do
 
       before do
         from_db.update_attributes(
-          addresses: [
-            { locations: [{ name: "work" }]}
-          ]
+            addresses: [
+                { locations: [{ name: "work" }]}
+            ]
         )
       end
 
@@ -3900,8 +3704,8 @@ describe Mongoid::Relations::Embedded::Many do
 
     before do
       person.update_attributes(
-        appointments: [ appointment_one.as_document, appointment_two.as_document ],
-        symptoms: [ symptom_one.as_document, symptom_two.as_document ]
+          appointments: [ appointment_one.as_document, appointment_two.as_document ],
+          symptoms: [ symptom_one.as_document, symptom_two.as_document ]
       )
     end
 
@@ -3984,7 +3788,7 @@ describe Mongoid::Relations::Embedded::Many do
     end
   end
 
-  context "#delete, or #clear, or #pop, or #shift with before_remove callback" do
+  context "#delete or #clear with before_remove callback" do
 
     let(:artist) do
       Artist.new
@@ -4030,81 +3834,35 @@ describe Mongoid::Relations::Embedded::Many do
         end
       end
 
-      describe "#pop" do
-
-        before do
-          artist.songs.pop
-        end
-
-        it "executes the callback" do
-          artist.songs.pop
-          expect(artist.before_remove_embedded_called).to be true
-        end
-      end
-
-      describe "#shift" do
-
-        before do
-          artist.songs.shift
-        end
-
-        it "executes the callback" do
-          artist.songs.shift
-          expect(artist.before_remove_embedded_called).to be true
-        end
-      end
-    end
-
-    context "when errors are raised" do
-
-      before do
-        expect(artist).to receive(:before_remove_song).and_raise
-      end
-
-      describe "#delete" do
-
-        it "does not remove the document from the relation" do
-          begin; artist.songs.delete(song); rescue; end
-          expect(artist.songs).to eq([ song ])
-        end
-      end
-
-      describe "#clear" do
+      context "when errors are raised" do
 
         before do
-          begin; artist.songs.clear; rescue; end
+          expect(artist).to receive(:before_remove_song).and_raise
         end
 
-        it "removes the documents from the relation" do
-          expect(artist.songs).to eq([ song ])
-        end
-      end
+        describe "#delete" do
 
-      describe "#pop" do
-
-        before do
-          begin; artist.songs.pop; rescue; end
-        end
-
-        it "should remove from collection" do
-          expect(artist.songs).to eq([ song ])
+          it "does not remove the document from the relation" do
+            begin; artist.songs.delete(song); rescue; end
+            expect(artist.songs).to eq([ song ])
+          end
         end
-      end
 
-      describe "#shift" do
+        describe "#clear" do
 
-        before do
-          begin; artist.songs.shift; rescue; end
-        end
+          before do
+            begin; artist.songs.clear; rescue; end
+          end
 
-        it "should remove from collection" do
-          expect(artist.songs).to eq([ song ])
+          it "removes the documents from the relation" do
+            expect(artist.songs).to eq([ song ])
+          end
         end
       end
     end
   end
 
-  context "#delete, or #clear, or #pop, or #shift with after_remove callback" do
+  context "#delete or #clear with after_remove callback" do
 
     let(:artist) do
       Artist.new
@@ -4141,30 +3899,6 @@ describe Mongoid::Relations::Embedded::Many do
           expect(artist.after_remove_embedded_called).to be true
         end
       end
-
-      describe "#pop" do
-
-        before do
-          artist.labels.pop
-        end
-
-        it "executes the callback" do
-          artist.labels.pop
-          expect(artist.after_remove_embedded_called).to be true
-        end
-      end
-
-      describe "#shift" do
-
-        before do
-          artist.labels.shift
-        end
-
-        it "executes the callback" do
-          artist.labels.shift
-          expect(artist.after_remove_embedded_called).to be true
-        end
-      end
     end
 
     context "when errors are raised" do
@@ -4194,28 +3928,6 @@ describe Mongoid::Relations::Embedded::Many do
           expect(artist.labels).to be_empty
         end
       end
-
-      describe "#pop" do
-
-        before do
-          begin; artist.labels.pop; rescue; end
-        end
-
-        it "should remove from collection" do
-          expect(artist.labels).to be_empty
-        end
-      end
-
-      describe "#shift" do
-
-        before do
-          begin; artist.labels.shift; rescue; end
-        end
-
-        it "should remove from collection" do
-          expect(artist.labels).to be_empty
-        end
-      end
     end
   end
 
@@ -4249,8 +3961,8 @@ describe Mongoid::Relations::Embedded::Many do
 
     before do
       band.collection.
-        find(_id: band.id).
-        update_one("$set" => { records: [{ name: "Moderat" }]})
+          find(_id: band.id).
+          update_one("$set" => { records: [{ name: "Moderat" }]})
     end
 
     context "when loading the documents" do
@@ -4347,7 +4059,7 @@ describe Mongoid::Relations::Embedded::Many do
           zone.soa = soa_1
         end
 
-        it "properly sets the metadata" do
+        it "properly sets the association metadata" do
           expect(zone.soa = soa_2).to eq(soa_2)
         end
       end
@@ -4362,7 +4074,7 @@ describe Mongoid::Relations::Embedded::Many do
           zone.soa = soa_1
         end
 
-        it "properly sets the metadata" do
+        it "properly sets the association metadata" do
           expect(zone.soa.delete).to be true
         end
       end
@@ -4388,7 +4100,7 @@ describe Mongoid::Relations::Embedded::Many do
           zone.soa = soa_1
         end
 
-        it "properly sets the metadata" do
+        it "properly sets the association" do
           expect(zone.soa = soa_2).to eq(soa_2)
         end
       end
@@ -4403,7 +4115,7 @@ describe Mongoid::Relations::Embedded::Many do
           zone.soa = soa_1
         end
 
-        it "properly sets the metadata" do
+        it "properly sets the association" do
           expect(zone.soa.delete).to be true
         end
       end