mongoid 8.0.8 → 8.1.0

data/spec/mongoid/interceptable_spec.rb

@@ -578,6 +578,26 @@ describe Mongoid::Interceptable do
           band.notes.push(note)
           record.notes.push(note)
         end
+
+        context "when saving the root" do
+          context 'with prevent_multiple_calls_of_embedded_callbacks enabled' do
+            config_override :prevent_multiple_calls_of_embedded_callbacks, true
+
+            it "executes the callbacks only once for each document" do
+              expect(note).to receive(:update_saved).once
+              band.save!
+            end
+          end
+
+          context 'with prevent_multiple_calls_of_embedded_callbacks disabled' do
+            config_override :prevent_multiple_calls_of_embedded_callbacks, false
+
+            it "executes the callbacks once for each ember" do
+              expect(note).to receive(:update_saved).twice
+              band.save!
+            end
+          end
+        end
       end
     end
 
@@ -1763,80 +1783,40 @@ describe Mongoid::Interceptable do
       end
     end
 
-    context 'with around callbacks' do
-      config_override :around_callbacks_for_embeds, true
+    let(:expected) do
+      [
+        [InterceptableSpec::CbCascadedChild, :before_validation],
+        [InterceptableSpec::CbCascadedChild, :after_validation],
+        [InterceptableSpec::CbParent, :before_validation],
+        [InterceptableSpec::CbCascadedChild, :before_validation],
+        [InterceptableSpec::CbCascadedChild, :after_validation],
 
-      let(:expected) do
-        [
-          [InterceptableSpec::CbCascadedChild, :before_validation],
-          [InterceptableSpec::CbCascadedChild, :after_validation],
-          [InterceptableSpec::CbParent, :before_validation],
-          [InterceptableSpec::CbCascadedChild, :before_validation],
-          [InterceptableSpec::CbCascadedChild, :after_validation],
-
-          [InterceptableSpec::CbParent, :after_validation],
-          [InterceptableSpec::CbParent, :before_save],
-          [InterceptableSpec::CbParent, :around_save_open],
-          [InterceptableSpec::CbParent, :before_create],
-          [InterceptableSpec::CbParent, :around_create_open],
-
-          [InterceptableSpec::CbCascadedChild, :before_save],
-          [InterceptableSpec::CbCascadedChild, :around_save_open],
-          [InterceptableSpec::CbCascadedChild, :before_create],
-          [InterceptableSpec::CbCascadedChild, :around_create_open],
-
-          [InterceptableSpec::CbCascadedChild, :around_create_close],
-          [InterceptableSpec::CbCascadedChild, :after_create],
-          [InterceptableSpec::CbCascadedChild, :around_save_close],
-          [InterceptableSpec::CbCascadedChild, :after_save],
-
-          [InterceptableSpec::CbParent, :around_create_close],
-          [InterceptableSpec::CbParent, :after_create],
-          [InterceptableSpec::CbParent, :around_save_close],
-          [InterceptableSpec::CbParent, :after_save]
-        ]
-      end
+        [InterceptableSpec::CbParent, :after_validation],
+        [InterceptableSpec::CbParent, :before_save],
+        [InterceptableSpec::CbParent, :around_save_open],
+        [InterceptableSpec::CbParent, :before_create],
+        [InterceptableSpec::CbParent, :around_create_open],
 
-      it 'calls callbacks in the right order' do
-        parent.save!
-        expect(registry.calls).to eq expected
-      end
-    end
+        [InterceptableSpec::CbCascadedChild, :before_save],
+        [InterceptableSpec::CbCascadedChild, :around_save_open],
+        [InterceptableSpec::CbCascadedChild, :before_create],
+        [InterceptableSpec::CbCascadedChild, :around_create_open],
 
-    context 'without around callbacks' do
-      config_override :around_callbacks_for_embeds, false
+        [InterceptableSpec::CbCascadedChild, :around_create_close],
+        [InterceptableSpec::CbCascadedChild, :after_create],
+        [InterceptableSpec::CbCascadedChild, :around_save_close],
+        [InterceptableSpec::CbCascadedChild, :after_save],
 
-      let(:expected) do
-        [
-          [InterceptableSpec::CbCascadedChild, :before_validation],
-          [InterceptableSpec::CbCascadedChild, :after_validation],
-          [InterceptableSpec::CbParent, :before_validation],
-          [InterceptableSpec::CbCascadedChild, :before_validation],
-          [InterceptableSpec::CbCascadedChild, :after_validation],
-
-          [InterceptableSpec::CbParent, :after_validation],
-          [InterceptableSpec::CbParent, :before_save],
-          [InterceptableSpec::CbParent, :around_save_open],
-          [InterceptableSpec::CbParent, :before_create],
-          [InterceptableSpec::CbParent, :around_create_open],
-
-          [InterceptableSpec::CbCascadedChild, :before_save],
-          [InterceptableSpec::CbCascadedChild, :before_create],
-
-          [InterceptableSpec::CbCascadedChild, :after_create],
-          [InterceptableSpec::CbCascadedChild, :after_save],
-
-          [InterceptableSpec::CbParent, :around_create_close],
-          [InterceptableSpec::CbParent, :after_create],
-          [InterceptableSpec::CbParent, :around_save_close],
-          [InterceptableSpec::CbParent, :after_save]
-        ]
-      end
+        [InterceptableSpec::CbParent, :around_create_close],
+        [InterceptableSpec::CbParent, :after_create],
+        [InterceptableSpec::CbParent, :around_save_close],
+        [InterceptableSpec::CbParent, :after_save]
+      ]
+    end
 
-      it 'calls callbacks in the right order' do
-        parent.save!
-        expect(registry.calls).to eq expected
-      end
+    it 'calls callbacks in the right order' do
+      parent.save!
+      expect(registry.calls).to eq expected
     end
   end
 
@@ -1899,180 +1879,89 @@ describe Mongoid::Interceptable do
       end
 
       context "create" do
-        context "with around callbacks" do
-          config_override :around_callbacks_for_embeds, true
-
-          let(:expected) do
-            [
-              [InterceptableSpec::CbEmbedsOneChild, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :after_validation],
-              [InterceptableSpec::CbEmbedsOneParent, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :after_validation],
-              [InterceptableSpec::CbEmbedsOneParent, :after_validation],
-
-              [InterceptableSpec::CbEmbedsOneParent, :before_save],
-              [InterceptableSpec::CbEmbedsOneParent, :around_save_open],
-              [InterceptableSpec::CbEmbedsOneParent, :before_create],
-              [InterceptableSpec::CbEmbedsOneParent, :around_create_open],
-
-              [InterceptableSpec::CbEmbedsOneChild, :before_save],
-              [InterceptableSpec::CbEmbedsOneChild, :around_save_open],
-              [InterceptableSpec::CbEmbedsOneChild, :before_create],
-              [InterceptableSpec::CbEmbedsOneChild, :around_create_open],
-
-              [InterceptableSpec::CbEmbedsOneParent, :insert_into_database],
-
-              [InterceptableSpec::CbEmbedsOneChild, :around_create_close],
-              [InterceptableSpec::CbEmbedsOneChild, :after_create],
-              [InterceptableSpec::CbEmbedsOneChild, :around_save_close],
-              [InterceptableSpec::CbEmbedsOneChild, :after_save],
-
-              [InterceptableSpec::CbEmbedsOneParent, :around_create_close],
-              [InterceptableSpec::CbEmbedsOneParent, :after_create],
-              [InterceptableSpec::CbEmbedsOneParent, :around_save_close],
-              [InterceptableSpec::CbEmbedsOneParent, :after_save]
-            ]
-          end
-
-          it 'calls callbacks in the right order' do
-            parent.save!
-            expect(registry.calls).to eq expected
-          end
+        let(:expected) do
+          [
+            [InterceptableSpec::CbEmbedsOneChild, :before_validation],
+            [InterceptableSpec::CbEmbedsOneChild, :after_validation],
+            [InterceptableSpec::CbEmbedsOneParent, :before_validation],
+            [InterceptableSpec::CbEmbedsOneChild, :before_validation],
+            [InterceptableSpec::CbEmbedsOneChild, :after_validation],
+            [InterceptableSpec::CbEmbedsOneParent, :after_validation],
+
+            [InterceptableSpec::CbEmbedsOneParent, :before_save],
+            [InterceptableSpec::CbEmbedsOneParent, :around_save_open],
+            [InterceptableSpec::CbEmbedsOneParent, :before_create],
+            [InterceptableSpec::CbEmbedsOneParent, :around_create_open],
+
+            [InterceptableSpec::CbEmbedsOneChild, :before_save],
+            [InterceptableSpec::CbEmbedsOneChild, :around_save_open],
+            [InterceptableSpec::CbEmbedsOneChild, :before_create],
+            [InterceptableSpec::CbEmbedsOneChild, :around_create_open],
+
+            [InterceptableSpec::CbEmbedsOneParent, :insert_into_database],
+
+            [InterceptableSpec::CbEmbedsOneChild, :around_create_close],
+            [InterceptableSpec::CbEmbedsOneChild, :after_create],
+            [InterceptableSpec::CbEmbedsOneChild, :around_save_close],
+            [InterceptableSpec::CbEmbedsOneChild, :after_save],
+
+            [InterceptableSpec::CbEmbedsOneParent, :around_create_close],
+            [InterceptableSpec::CbEmbedsOneParent, :after_create],
+            [InterceptableSpec::CbEmbedsOneParent, :around_save_close],
+            [InterceptableSpec::CbEmbedsOneParent, :after_save]
+          ]
         end
 
-        context "without around callbacks" do
-          config_override :around_callbacks_for_embeds, false
-
-          let(:expected) do
-            [
-              [InterceptableSpec::CbEmbedsOneChild, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :after_validation],
-              [InterceptableSpec::CbEmbedsOneParent, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :after_validation],
-              [InterceptableSpec::CbEmbedsOneParent, :after_validation],
-
-              [InterceptableSpec::CbEmbedsOneParent, :before_save],
-              [InterceptableSpec::CbEmbedsOneParent, :around_save_open],
-              [InterceptableSpec::CbEmbedsOneParent, :before_create],
-              [InterceptableSpec::CbEmbedsOneParent, :around_create_open],
-
-              [InterceptableSpec::CbEmbedsOneChild, :before_save],
-              [InterceptableSpec::CbEmbedsOneChild, :before_create],
-
-              [InterceptableSpec::CbEmbedsOneParent, :insert_into_database],
-
-              [InterceptableSpec::CbEmbedsOneChild, :after_create],
-              [InterceptableSpec::CbEmbedsOneChild, :after_save],
-
-              [InterceptableSpec::CbEmbedsOneParent, :around_create_close],
-              [InterceptableSpec::CbEmbedsOneParent, :after_create],
-              [InterceptableSpec::CbEmbedsOneParent, :around_save_close],
-              [InterceptableSpec::CbEmbedsOneParent, :after_save]
-            ]
-          end
-
-          it 'calls callbacks in the right order' do
-            parent.save!
-            expect(registry.calls).to eq expected
-          end
+        it 'calls callbacks in the right order' do
+          parent.save!
+          expect(registry.calls).to eq expected
         end
       end
 
       context "update" do
-        context "with around callbacks" do
-          config_override :around_callbacks_for_embeds, true
-
-          let(:expected) do
-            [
-              [InterceptableSpec::CbEmbedsOneChild, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :after_validation],
-              [InterceptableSpec::CbEmbedsOneParent, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :after_validation],
-              [InterceptableSpec::CbEmbedsOneParent, :after_validation],
-
-              [InterceptableSpec::CbEmbedsOneParent, :before_save],
-              [InterceptableSpec::CbEmbedsOneParent, :around_save_open],
-              [InterceptableSpec::CbEmbedsOneParent, :before_update],
-              [InterceptableSpec::CbEmbedsOneParent, :around_update_open],
-
-              [InterceptableSpec::CbEmbedsOneChild, :before_save],
-              [InterceptableSpec::CbEmbedsOneChild, :around_save_open],
-              [InterceptableSpec::CbEmbedsOneChild, :before_update],
-              [InterceptableSpec::CbEmbedsOneChild, :around_update_open],
-
-              [InterceptableSpec::CbEmbedsOneChild, :around_update_close],
-              [InterceptableSpec::CbEmbedsOneChild, :after_update],
-              [InterceptableSpec::CbEmbedsOneChild, :around_save_close],
-              [InterceptableSpec::CbEmbedsOneChild, :after_save],
-
-              [InterceptableSpec::CbEmbedsOneParent, :around_update_close],
-              [InterceptableSpec::CbEmbedsOneParent, :after_update],
-              [InterceptableSpec::CbEmbedsOneParent, :around_save_close],
-              [InterceptableSpec::CbEmbedsOneParent, :after_save]
-            ]
-          end
-
-          it 'calls callbacks in the right order' do
-            parent.callback_registry = nil
-            parent.child.callback_registry = nil
-            parent.save!
-
-            parent.callback_registry = registry
-            parent.child.callback_registry = registry
-            parent.name = "name"
-            parent.child.age = 10
-
-            parent.save!
-            expect(registry.calls).to eq expected
-          end
+        let(:expected) do
+          [
+            [InterceptableSpec::CbEmbedsOneChild, :before_validation],
+            [InterceptableSpec::CbEmbedsOneChild, :after_validation],
+            [InterceptableSpec::CbEmbedsOneParent, :before_validation],
+            [InterceptableSpec::CbEmbedsOneChild, :before_validation],
+            [InterceptableSpec::CbEmbedsOneChild, :after_validation],
+            [InterceptableSpec::CbEmbedsOneParent, :after_validation],
+
+            [InterceptableSpec::CbEmbedsOneParent, :before_save],
+            [InterceptableSpec::CbEmbedsOneParent, :around_save_open],
+            [InterceptableSpec::CbEmbedsOneParent, :before_update],
+            [InterceptableSpec::CbEmbedsOneParent, :around_update_open],
+
+            [InterceptableSpec::CbEmbedsOneChild, :before_save],
+            [InterceptableSpec::CbEmbedsOneChild, :around_save_open],
+            [InterceptableSpec::CbEmbedsOneChild, :before_update],
+            [InterceptableSpec::CbEmbedsOneChild, :around_update_open],
+
+            [InterceptableSpec::CbEmbedsOneChild, :around_update_close],
+            [InterceptableSpec::CbEmbedsOneChild, :after_update],
+            [InterceptableSpec::CbEmbedsOneChild, :around_save_close],
+            [InterceptableSpec::CbEmbedsOneChild, :after_save],
+
+            [InterceptableSpec::CbEmbedsOneParent, :around_update_close],
+            [InterceptableSpec::CbEmbedsOneParent, :after_update],
+            [InterceptableSpec::CbEmbedsOneParent, :around_save_close],
+            [InterceptableSpec::CbEmbedsOneParent, :after_save]
+          ]
         end
 
-        context "without around callbacks" do
-          config_override :around_callbacks_for_embeds, false
-
-          let(:expected) do
-            [
-              [InterceptableSpec::CbEmbedsOneChild, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :after_validation],
-              [InterceptableSpec::CbEmbedsOneParent, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :before_validation],
-              [InterceptableSpec::CbEmbedsOneChild, :after_validation],
-              [InterceptableSpec::CbEmbedsOneParent, :after_validation],
-
-              [InterceptableSpec::CbEmbedsOneParent, :before_save],
-              [InterceptableSpec::CbEmbedsOneParent, :around_save_open],
-              [InterceptableSpec::CbEmbedsOneParent, :before_update],
-              [InterceptableSpec::CbEmbedsOneParent, :around_update_open],
-
-              [InterceptableSpec::CbEmbedsOneChild, :before_save],
-              [InterceptableSpec::CbEmbedsOneChild, :before_update],
-
-              [InterceptableSpec::CbEmbedsOneChild, :after_update],
-              [InterceptableSpec::CbEmbedsOneChild, :after_save],
-
-              [InterceptableSpec::CbEmbedsOneParent, :around_update_close],
-              [InterceptableSpec::CbEmbedsOneParent, :after_update],
-              [InterceptableSpec::CbEmbedsOneParent, :around_save_close],
-              [InterceptableSpec::CbEmbedsOneParent, :after_save]
-            ]
-          end
-
-          it 'calls callbacks in the right order' do
-            parent.callback_registry = nil
-            parent.child.callback_registry = nil
-            parent.save!
+        it 'calls callbacks in the right order' do
+          parent.callback_registry = nil
+          parent.child.callback_registry = nil
+          parent.save!
 
-            parent.callback_registry = registry
-            parent.child.callback_registry = registry
-            parent.name = "name"
-            parent.child.age = 10
+          parent.callback_registry = registry
+          parent.child.callback_registry = registry
+          parent.name = "name"
+          parent.child.age = 10
 
-            parent.save!
-            expect(registry.calls).to eq expected
-          end
+          parent.save!
+          expect(registry.calls).to eq expected
         end
       end
     end
@@ -2152,114 +2041,59 @@ describe Mongoid::Interceptable do
         end
       end
 
-      context "with around callbacks" do
-        config_override :around_callbacks_for_embeds, true
-
-        let(:expected) do
-          [
-            [InterceptableSpec::CbEmbedsManyChild, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :after_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :after_validation],
-            [InterceptableSpec::CbEmbedsManyParent, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :after_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :after_validation],
-            [InterceptableSpec::CbEmbedsManyParent, :after_validation],
-
-            [InterceptableSpec::CbEmbedsManyParent, :before_save],
-            [InterceptableSpec::CbEmbedsManyParent, :around_save_open],
-            [InterceptableSpec::CbEmbedsManyParent, :before_create],
-            [InterceptableSpec::CbEmbedsManyParent, :around_create_open],
-
-            [InterceptableSpec::CbEmbedsManyChild, :before_save],
-            [InterceptableSpec::CbEmbedsManyChild, :around_save_open],
-            [InterceptableSpec::CbEmbedsManyChild, :before_save],
-
-            [InterceptableSpec::CbEmbedsManyChild, :around_save_open],
-            [InterceptableSpec::CbEmbedsManyChild, :before_create],
-            [InterceptableSpec::CbEmbedsManyChild, :around_create_open],
-
-            [InterceptableSpec::CbEmbedsManyChild, :before_create],
-            [InterceptableSpec::CbEmbedsManyChild, :around_create_open],
-
-            [InterceptableSpec::CbEmbedsManyParent, :insert_into_database],
-
-            [InterceptableSpec::CbEmbedsManyChild, :around_create_close],
-            [InterceptableSpec::CbEmbedsManyChild, :after_create],
-
-            [InterceptableSpec::CbEmbedsManyChild, :around_create_close],
-            [InterceptableSpec::CbEmbedsManyChild, :after_create],
-
-            [InterceptableSpec::CbEmbedsManyChild, :around_save_close],
-            [InterceptableSpec::CbEmbedsManyChild, :after_save],
-
-            [InterceptableSpec::CbEmbedsManyChild, :around_save_close],
-            [InterceptableSpec::CbEmbedsManyChild, :after_save],
-
-            [InterceptableSpec::CbEmbedsManyParent, :around_create_close],
-            [InterceptableSpec::CbEmbedsManyParent, :after_create],
-            [InterceptableSpec::CbEmbedsManyParent, :around_save_close],
-            [InterceptableSpec::CbEmbedsManyParent, :after_save]
-          ]
-        end
-
-        it 'calls callbacks in the right order' do
-          parent.save!
-          expect(registry.calls).to eq expected
-        end
+      let(:expected) do
+        [
+          [InterceptableSpec::CbEmbedsManyChild, :before_validation],
+          [InterceptableSpec::CbEmbedsManyChild, :after_validation],
+          [InterceptableSpec::CbEmbedsManyChild, :before_validation],
+          [InterceptableSpec::CbEmbedsManyChild, :after_validation],
+          [InterceptableSpec::CbEmbedsManyParent, :before_validation],
+          [InterceptableSpec::CbEmbedsManyChild, :before_validation],
+          [InterceptableSpec::CbEmbedsManyChild, :after_validation],
+          [InterceptableSpec::CbEmbedsManyChild, :before_validation],
+          [InterceptableSpec::CbEmbedsManyChild, :after_validation],
+          [InterceptableSpec::CbEmbedsManyParent, :after_validation],
+
+          [InterceptableSpec::CbEmbedsManyParent, :before_save],
+          [InterceptableSpec::CbEmbedsManyParent, :around_save_open],
+          [InterceptableSpec::CbEmbedsManyParent, :before_create],
+          [InterceptableSpec::CbEmbedsManyParent, :around_create_open],
+
+          [InterceptableSpec::CbEmbedsManyChild, :before_save],
+          [InterceptableSpec::CbEmbedsManyChild, :around_save_open],
+          [InterceptableSpec::CbEmbedsManyChild, :before_save],
+
+          [InterceptableSpec::CbEmbedsManyChild, :around_save_open],
+          [InterceptableSpec::CbEmbedsManyChild, :before_create],
+          [InterceptableSpec::CbEmbedsManyChild, :around_create_open],
+
+          [InterceptableSpec::CbEmbedsManyChild, :before_create],
+          [InterceptableSpec::CbEmbedsManyChild, :around_create_open],
+
+          [InterceptableSpec::CbEmbedsManyParent, :insert_into_database],
+
+          [InterceptableSpec::CbEmbedsManyChild, :around_create_close],
+          [InterceptableSpec::CbEmbedsManyChild, :after_create],
+
+          [InterceptableSpec::CbEmbedsManyChild, :around_create_close],
+          [InterceptableSpec::CbEmbedsManyChild, :after_create],
+
+          [InterceptableSpec::CbEmbedsManyChild, :around_save_close],
+          [InterceptableSpec::CbEmbedsManyChild, :after_save],
+
+          [InterceptableSpec::CbEmbedsManyChild, :around_save_close],
+          [InterceptableSpec::CbEmbedsManyChild, :after_save],
+
+          [InterceptableSpec::CbEmbedsManyParent, :around_create_close],
+          [InterceptableSpec::CbEmbedsManyParent, :after_create],
+          [InterceptableSpec::CbEmbedsManyParent, :around_save_close],
+          [InterceptableSpec::CbEmbedsManyParent, :after_save]
+        ]
       end
 
-      context "without around callbacks" do
-        config_override :around_callbacks_for_embeds, false
-
-        let(:expected) do
-          [
-            [InterceptableSpec::CbEmbedsManyChild, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :after_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :after_validation],
-            [InterceptableSpec::CbEmbedsManyParent, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :after_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :before_validation],
-            [InterceptableSpec::CbEmbedsManyChild, :after_validation],
-            [InterceptableSpec::CbEmbedsManyParent, :after_validation],
-
-            [InterceptableSpec::CbEmbedsManyParent, :before_save],
-            [InterceptableSpec::CbEmbedsManyParent, :around_save_open],
-            [InterceptableSpec::CbEmbedsManyParent, :before_create],
-            [InterceptableSpec::CbEmbedsManyParent, :around_create_open],
-
-            [InterceptableSpec::CbEmbedsManyChild, :before_save],
-            [InterceptableSpec::CbEmbedsManyChild, :before_save],
-
-            [InterceptableSpec::CbEmbedsManyChild, :before_create],
-
-            [InterceptableSpec::CbEmbedsManyChild, :before_create],
-
-            [InterceptableSpec::CbEmbedsManyParent, :insert_into_database],
-
-            [InterceptableSpec::CbEmbedsManyChild, :after_create],
-
-            [InterceptableSpec::CbEmbedsManyChild, :after_create],
-
-            [InterceptableSpec::CbEmbedsManyChild, :after_save],
-
-            [InterceptableSpec::CbEmbedsManyChild, :after_save],
-
-            [InterceptableSpec::CbEmbedsManyParent, :around_create_close],
-            [InterceptableSpec::CbEmbedsManyParent, :after_create],
-            [InterceptableSpec::CbEmbedsManyParent, :around_save_close],
-            [InterceptableSpec::CbEmbedsManyParent, :after_save]
-          ]
-        end
-
-        it 'calls callbacks in the right order' do
-          parent.save!
-          expect(registry.calls).to eq expected
-        end
+      it 'calls callbacks in the right order' do
+        parent.save!
+        expect(registry.calls).to eq expected
       end
     end
   end
@@ -2548,27 +2382,4 @@ describe Mongoid::Interceptable do
       end.to_not raise_error(ActiveModel::MissingAttributeError)
     end
   end
-
-  context "when around callbacks for embedded are disabled" do
-    config_override :around_callbacks_for_embeds, false
-
-    context "when around callback is defined" do
-      let(:registry) { InterceptableSpec::CallbackRegistry.new }
-
-      let(:parent) do
-        InterceptableSpec::CbEmbedsOneParent.new(registry).tap do |parent|
-          parent.child = InterceptableSpec::CbEmbedsOneChild.new(registry)
-        end
-      end
-
-      before do
-        expect(Mongoid.logger).to receive(:warn).with(/Around callbacks are disabled for embedded documents/).twice.and_call_original
-        expect(Mongoid.logger).to receive(:warn).with(/To enable around callbacks for embedded documents/).twice.and_call_original
-      end
-
-      it "logs a warning" do
-        parent.save!
-      end
-    end
-  end
 end

data/spec/mongoid/persistable/deletable_spec.rb

@@ -12,14 +12,34 @@ describe Mongoid::Persistable::Deletable do
 
     context "when deleting a readonly document" do
 
-      let(:from_db) do
-        Person.only(:_id).first
+      context "when legacy_attributes is true" do
+        config_override :legacy_readonly, true
+
+        let(:from_db) do
+          Person.only(:_id).first
+        end
+
+        it "raises an error" do
+          expect(from_db.readonly?).to be true
+          expect {
+            from_db.delete
+          }.to raise_error(Mongoid::Errors::ReadonlyDocument)
+        end
       end
 
-      it "raises an error" do
-        expect {
-          from_db.delete
-        }.to raise_error(Mongoid::Errors::ReadonlyDocument)
+      context "when legacy_attributes is false" do
+        config_override :legacy_readonly, false
+
+        let(:from_db) do
+          Person.first.tap(&:readonly!)
+        end
+
+        it "raises an error" do
+          expect(from_db.readonly?).to be true
+          expect {
+            from_db.delete
+          }.to raise_error(Mongoid::Errors::ReadonlyDocument)
+        end
       end
     end