Merge pull request autofac#1196 from alistairjevans/develop

Ensure that middleware added to a scanning registration is copied to all found types.
alsacad · Aug 29, 2020 · fd27195 · fd27195
2 parents f6954c3 + e0f721b
commit fd27195
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 0 deletions.
diff --git a/src/Autofac/Features/Scanning/ScanningRegistrationExtensions.cs b/src/Autofac/Features/Scanning/ScanningRegistrationExtensions.cs
@@ -127,6 +127,9 @@ private static void ScanTypes(IEnumerable<Type> types, IComponentRegistryBuilder
                     .WithParameters(rb.ActivatorData.ConfiguredParameters)
                     .WithProperties(rb.ActivatorData.ConfiguredProperties);
 
+                // Copy middleware from the scanning registration.
+                scanned.ResolvePipeline.UseRange(rb.ResolvePipeline.Middleware);
+
                 scanned.RegistrationData.CopyFrom(rb.RegistrationData, false);
 
                 foreach (var action in rb.ActivatorData.ConfigurationActions)

diff --git a/test/Autofac.Test/Features/Scanning/ScanningRegistrationTests.cs b/test/Autofac.Test/Features/Scanning/ScanningRegistrationTests.cs
@@ -491,5 +491,53 @@ public void PublicNestedClassesAreScanned()
             var c = RegisterScenarioAssembly();
             c.AssertRegistered<NestedComponent.PublicComponent>();
         }
+
+        [Fact]
+        public void ScannedAssembliesPreparingEventFires()
+        {
+            var preparingCalled = false;
+
+            var cb = new ContainerBuilder();
+            cb.RegisterAssemblyTypes(typeof(AComponent).GetTypeInfo().Assembly)
+                .OnPreparing(args => preparingCalled = true);
+
+            var c = cb.Build();
+
+            var a = c.Resolve<AComponent>();
+
+            Assert.True(preparingCalled);
+        }
+
+        [Fact]
+        public void ScannedAssembliesActivatedEventFires()
+        {
+            var activatedCalled = false;
+
+            var cb = new ContainerBuilder();
+            cb.RegisterAssemblyTypes(typeof(AComponent).GetTypeInfo().Assembly)
+                .OnActivated(args => activatedCalled = true);
+
+            var c = cb.Build();
+
+            var a = c.Resolve<AComponent>();
+
+            Assert.True(activatedCalled);
+        }
+
+        [Fact]
+        public void ScannedAssembliesActivatingEventFires()
+        {
+            var activatingCalled = false;
+
+            var cb = new ContainerBuilder();
+            cb.RegisterAssemblyTypes(typeof(AComponent).GetTypeInfo().Assembly)
+                .OnActivating(args => activatingCalled = true);
+
+            var c = cb.Build();
+
+            var a = c.Resolve<AComponent>();
+
+            Assert.True(activatingCalled);
+        }
     }
 }