Support invocation of abstract members when callsBaseMethods is set

autofac · Jun 4, 2018 · b998a8e · b998a8e
1 parent e875bf0
commit b998a8e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/Autofac.Extras.FakeItEasy/FakeRegistrationHandler.cs b/src/Autofac.Extras.FakeItEasy/FakeRegistrationHandler.cs
@@ -1,5 +1,5 @@
 // This software is part of the Autofac IoC container
-// Copyright (c) 2007 - 2008 Autofac Contributors
+// Copyright (c) 2007 - 2018 Autofac Contributors
 // http://autofac.org
 //
 // Permission is hereby granted, free of charge, to any person
@@ -103,26 +103,24 @@ public IEnumerable<IComponentRegistration> RegistrationsFor(
         /// <returns>A fake object.</returns>
         private object CreateFake(TypedService typedService)
         {
-            var fake = Create.Fake(typedService.ServiceType, this.ApplyOptions);
-
-            if (this._callsBaseMethods)
-            {
-                A.CallTo(fake).CallsBaseMethod();
-            }
-
-            return fake;
+            return Create.Fake(typedService.ServiceType, this.ApplyOptions);
         }
 
         private void ApplyOptions(IFakeOptions options)
         {
             if (this._strict)
             {
-                options.Strict();
+                options = options.Strict();
             }
 
             if (this._configureFake != null)
             {
-                options.ConfigureFake(x => this._configureFake(x));
+                options = options.ConfigureFake(x => this._configureFake(x));
+            }
+
+            if (this._callsBaseMethods)
+            {
+                options.CallsBaseMethods();
             }
         }
     }

diff --git a/test/Autofac.Extras.FakeItEasy.Test/AutoFakeFixture.cs b/test/Autofac.Extras.FakeItEasy.Test/AutoFakeFixture.cs
@@ -89,6 +89,16 @@ public void CanResolveFakesWhichCallsBaseMethods()
             }
         }
 
+        [Fact]
+        public void CanResolveFakesWhichCallsBaseMethodsAndInvokeAbstractMethod()
+        {
+            using (var fake = new AutoFake(callsBaseMethods: true))
+            {
+                var bar = fake.Resolve<Bar>();
+                bar.GoAbstractly();
+            }
+        }
+
         [Fact]
         public void CanResolveFakesWhichInvokeActionsWhenResolved()
         {
@@ -198,6 +208,8 @@ public IBar Spawn()
             {
                 throw new NotImplementedException();
             }
+
+            public abstract void GoAbstractly();
         }
 
         public class Baz : IBaz