mongoid 8.0.5 → 8.0.7

data/spec/mongoid/interceptable_spec.rb

@@ -578,14 +578,6 @@ describe Mongoid::Interceptable do
           band.notes.push(note)
           record.notes.push(note)
         end
-
-        context "when saving the root" do
-
-          it "only executes the callbacks once for each embed" do
-            expect(note).to receive(:update_saved).twice
-            band.save!
-          end
-        end
       end
     end
 
@@ -1771,40 +1763,80 @@ describe Mongoid::Interceptable do
       end
     end
 
-    let(:expected) do
-      [
-        [InterceptableSpec::CbCascadedChild, :before_validation],
-        [InterceptableSpec::CbCascadedChild, :after_validation],
-        [InterceptableSpec::CbParent, :before_validation],
-        [InterceptableSpec::CbCascadedChild, :before_validation],
-        [InterceptableSpec::CbCascadedChild, :after_validation],
+    context 'with around callbacks' do
+      config_override :around_callbacks_for_embeds, true
 
-        [InterceptableSpec::CbParent, :after_validation],
-        [InterceptableSpec::CbParent, :before_save],
-        [InterceptableSpec::CbParent, :around_save_open],
-        [InterceptableSpec::CbParent, :before_create],
-        [InterceptableSpec::CbParent, :around_create_open],
+      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::CbCascadedChild, :before_save],
-        [InterceptableSpec::CbCascadedChild, :around_save_open],
-        [InterceptableSpec::CbCascadedChild, :before_create],
-        [InterceptableSpec::CbCascadedChild, :around_create_open],
+      it 'calls callbacks in the right order' do
+        parent.save!
+        expect(registry.calls).to eq expected
+      end
+    end
 
-        [InterceptableSpec::CbCascadedChild, :around_create_close],
-        [InterceptableSpec::CbCascadedChild, :after_create],
-        [InterceptableSpec::CbCascadedChild, :around_save_close],
-        [InterceptableSpec::CbCascadedChild, :after_save],
+    context 'without around callbacks' do
+      config_override :around_callbacks_for_embeds, false
 
-        [InterceptableSpec::CbParent, :around_create_close],
-        [InterceptableSpec::CbParent, :after_create],
-        [InterceptableSpec::CbParent, :around_save_close],
-        [InterceptableSpec::CbParent, :after_save]
-      ]
-    end
+      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
 
-    it 'calls callbacks in the right order' do
-      parent.save!
-      expect(registry.calls).to eq expected
+      it 'calls callbacks in the right order' do
+        parent.save!
+        expect(registry.calls).to eq expected
+      end
     end
   end
 
@@ -1867,89 +1899,180 @@ describe Mongoid::Interceptable do
       end
 
       context "create" do
-        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]
-          ]
+        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
         end
 
-        it 'calls callbacks in the right order' do
-          parent.save!
-          expect(registry.calls).to eq expected
+        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
         end
       end
 
       context "update" do
-        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]
-          ]
+        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
         end
 
-        it 'calls callbacks in the right order' do
-          parent.callback_registry = nil
-          parent.child.callback_registry = nil
-          parent.save!
+        context "without around callbacks" do
+          config_override :around_callbacks_for_embeds, false
 
-          parent.callback_registry = registry
-          parent.child.callback_registry = registry
-          parent.name = "name"
-          parent.child.age = 10
+          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],
 
-          parent.save!
-          expect(registry.calls).to eq expected
+              [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!
+
+            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
         end
       end
     end
@@ -2029,59 +2152,114 @@ describe Mongoid::Interceptable do
         end
       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]
-        ]
+      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
       end
 
-      it 'calls callbacks in the right order' do
-        parent.save!
-        expect(registry.calls).to eq expected
+      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
       end
     end
   end
@@ -2370,4 +2548,27 @@ 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/shared/lib/mrss/docker_runner.rb

@@ -195,12 +195,15 @@ module Mrss
       'debian81' => 'debian:jessie',
       'debian92' => 'debian:stretch',
       'debian10' => 'debian:buster',
+      'debian11' => 'debian:bullseye',
       'ubuntu1404' => 'ubuntu:trusty',
       'ubuntu1604' => 'ubuntu:xenial',
       'ubuntu1804' => 'ubuntu:bionic',
       'ubuntu2004' => 'ubuntu:focal',
+      'ubuntu2204' => 'ubuntu:jammy',
       'rhel62' => 'centos:6',
       'rhel70' => 'centos:7',
+      'rhel80' => 'rockylinux:8',
     }.freeze
 
     def base_image
@@ -231,6 +234,10 @@ module Mrss
       distro =~ /debian|ubuntu/
     end
 
+    def ubuntu?
+      distro=~ /ubuntu/
+    end
+
     def preload?
       !!@options[:preload]
     end

data/spec/shared/lib/mrss/event_subscriber.rb

@@ -84,22 +84,32 @@ module Mrss
 
     # Locates command stated events for the specified command name,
     # asserts that there is exactly one such event, and returns it.
-    def single_command_started_event(command_name, include_auth: false)
+    def single_command_started_event(command_name, include_auth: false, database_name: nil)
       events = if include_auth
                  started_events
                else
                  non_auth_command_started_events
                end
-      events.select! do |event|
-        event.command[command_name]
+      get_one_event(events, command_name, 'started', database_name: database_name)
+    end
+
+    # Locates command succeeded events for the specified command name,
+    # asserts that there is exactly one such event, and returns it.
+    def single_command_succeeded_event(command_name, database_name: nil)
+      get_one_event(succeeded_events, command_name, 'succeeded', database_name: database_name)
+    end
+
+    def get_one_event(events, command_name, kind, database_name: nil)
+      events = events.select do |event|
+        event.command_name == command_name and
+        database_name.nil? || database_name == event.database_name
       end
       if events.length != 1
-        raise "Expected a single #{command_name} event but we have #{events.length}"
+        raise "Expected a single '#{command_name}' #{kind} event#{database_name ? " for '#{database_name}'" : ''} but we have #{events.length}"
       end
       events.first
     end
 
-
     # Get the first succeeded event published for the name, and then delete it.
     #
     # @param [ String ] name The event name.