ShouldPassForThe now recognizes the model objects earlier in the assertions chain for views (#359)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/PluginsContainer.cs

@@ -45,7 +45,7 @@ public static void LoadPlugins(DependencyContext dependencyContext)
             var plugins = testFrameworkAssemblies
                 .Select(l => Assembly
                     .Load(new AssemblyName(l.Name))
-                    .GetType($"{testFrameworkName}.Plugins.{l.Name.Replace(testFrameworkName, string.Empty).Trim('.')}TestPlugin"))
+                    .GetType($"{testFrameworkName}.Plugins.{l.Name.Replace(testFrameworkName, string.Empty).Replace(".", string.Empty)}TestPlugin"))
                 .Where(p => p != null)
                 .ToArray();
 

src/MyTested.AspNetCore.Mvc.Controllers.Views/Plugins/ControllersViewsTestPlugin.cs

@@ -0,0 +1,29 @@
+namespace MyTested.AspNetCore.Mvc.Plugins
+{
+    using System;
+    using Internal.TestContexts;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.Extensions.DependencyInjection;
+
+    public class ControllersViewsTestPlugin : IDefaultRegistrationPlugin, IShouldPassForPlugin
+    {
+        public long Priority => -1000;
+
+        public Action<IServiceCollection> DefaultServiceRegistrationDelegate
+            => serviceCollection => serviceCollection
+                .AddMvcCore()
+                .AddFormatterMappings()
+                .AddViews()
+                .AddDataAnnotations();
+
+        public object TryGetValue(Type type, ComponentTestContext testContext)
+            => testContext.MethodResult switch
+            {
+                JsonResult jsonResult => jsonResult.Value,
+                ViewResult viewResult => viewResult.Model,
+                PartialViewResult partialViewResult => partialViewResult.Model,
+                ViewComponentResult viewComponentResult => viewComponentResult.Model,
+                _ => null
+            };
+    }
+}

src/MyTested.AspNetCore.Mvc.Controllers.Views/Plugins/ViewActionResultsTestPlugin.cs

@@ -117,7 +117,7 @@ public void AndAlsoShouldWorkCorrectly()
         }
 
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectly()
+        public void ShouldPassForTheShouldWorkCorrectlyWithActionResult()
         {
             MyController<MvcController>
                 .Instance()
@@ -132,6 +132,18 @@ public void AndProvideTheActionResultShouldWorkCorrectly()
                 });
         }
 
+        [Fact]
+        public void ShouldPassForTheShouldWorkCorrectlyWithModel()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.JsonAction())
+                .ShouldReturn()
+                .Json()
+                .AndAlso()
+                .ShouldPassForThe<ICollection<ResponseModel>>(model => model.Count == 2);
+        }
+
         [Fact]
         public void WithNullJsonShouldReturnNoModel()
         {

test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/BuildersTests/ActionResultsTests/JsonTests/JsonTestBuilderTests.cs

@@ -156,7 +156,7 @@ public void AndAlsoShouldWorkCorrectly()
         }
 
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectly()
+        public void ShouldPassForTheShouldWorkCorrectlyWithActionResult()
         {
             MyController<MvcController>
                 .Instance()
@@ -171,15 +171,27 @@ public void AndProvideTheActionResultShouldWorkCorrectly()
                 });
         }
 
+        [Fact]
+        public void ShouldPassForTheShouldWorkCorrectlyWithModel()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.CustomViewComponentResultWithViewData())
+                .ShouldReturn()
+                .ViewComponent()
+                .AndAlso()
+                .ShouldPassForThe<ICollection<ResponseModel>>(model => model.Count == 2);
+        }
+
         [Fact]
         public void WithNoModelShouldNotThrowExceptionWhenNoModelIsReturned()
         {
             MyController<MvcController>
                 .Instance()
                 .Calling(c => c.ViewComponentResultByType())
                 .ShouldReturn()
-                .ViewComponent(viewComponent =>
-                    viewComponent.WithNoModel());
+                .ViewComponent(viewComponent => viewComponent
+                    .WithNoModel());
         }
 
         [Fact]
@@ -189,8 +201,8 @@ public void WithModelOfTypeShouldNotThrowExceptionWithCorrectTypeForViewComponen
                 .Instance()
                 .Calling(c => c.CustomViewComponentResultWithViewData())
                 .ShouldReturn()
-                .ViewComponent(viewComponent =>
-                    viewComponent.WithModelOfType<List<ResponseModel>>());
+                .ViewComponent(viewComponent => viewComponent
+                    .WithModelOfType<List<ResponseModel>>());
         }
 
         [Fact]

test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/BuildersTests/ActionResultsTests/ViewTests/ViewComponentTestBuilderTests.cs

@@ -505,7 +505,7 @@ public void AndAlsoShouldWorkCorrectlyForPartialsWhenDifferInStatusCode()
         }
 
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectly()
+        public void ShouldPassForTheShouldWorkCorrectlyWithViewAndActionResult()
         {
             MyController<MvcController>
                 .Instance()
@@ -521,7 +521,19 @@ public void AndProvideTheActionResultShouldWorkCorrectly()
         }
 
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectlyWithPartial()
+        public void ShouldPassForTheShouldWorkCorrectlyWithViewAndModel()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.DefaultViewWithModel())
+                .ShouldReturn()
+                .View()
+                .AndAlso()
+                .ShouldPassForThe<ICollection<ResponseModel>>(model => model.Count == 2);
+        }
+
+        [Fact]
+        public void ShouldPassForTheShouldWorkCorrectlyWithPartialViewAndActionResult()
         {
             MyController<MvcController>
                 .Instance()
@@ -536,15 +548,27 @@ public void AndProvideTheActionResultShouldWorkCorrectlyWithPartial()
                 });
         }
 
+        [Fact]
+        public void ShouldPassForTheShouldWorkCorrectlyWithPartialViewAndModel()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.DefaultPartialViewWithModel())
+                .ShouldReturn()
+                .PartialView()
+                .AndAlso()
+                .ShouldPassForThe<ICollection<ResponseModel>>(model => model.Count == 2);
+        }
+
         [Fact]
         public void WithModelOfTypeShouldNotThrowExceptionWithCorrectTypeForPartialView()
         {
             MyController<MvcController>
                 .Instance()
                 .Calling(c => c.CustomPartialViewResultWithViewData())
                 .ShouldReturn()
-                .PartialView(partialView =>
-                    partialView.WithModelOfType<List<ResponseModel>>());
+                .PartialView(partialView => partialView
+                    .WithModelOfType<List<ResponseModel>>());
         }
 
         [Fact]
@@ -585,7 +609,7 @@ public void AndProvideTheActionResultShouldWorkCorrectlyForPartialViewModel()
                 .ShouldPassForThe<IActionResult>(actionResult =>
                 {
                     Assert.NotNull(actionResult);
-                    Assert.NotNull((actionResult as PartialViewResult).Model);
+                    Assert.NotNull((actionResult as PartialViewResult)?.Model);
                 });
         }
 

test/MyTested.AspNetCore.Mvc.Controllers.Views.Test/BuildersTests/ActionResultsTests/ViewTests/ViewTestBuilderTests.cs

@@ -11,7 +11,7 @@ public class ViewActionResultTestPluginTest
         [Fact]
         public void ShouldHavePriorityWithDefaultValue()
         {
-            var testPlugin = new ViewActionResultsTestPlugin();
+            var testPlugin = new ControllersViewsTestPlugin();
 
             Assert.IsAssignableFrom<IDefaultRegistrationPlugin>(testPlugin);
             Assert.NotNull(testPlugin);
@@ -21,15 +21,15 @@ public void ShouldHavePriorityWithDefaultValue()
         [Fact]
         public void ShouldThrowArgumentNullExceptionWithInvalidServiceCollection()
         {
-            var testPlugin = new ViewActionResultsTestPlugin();
+            var testPlugin = new ControllersViewsTestPlugin();
 
             Assert.Throws<ArgumentNullException>(() => testPlugin.DefaultServiceRegistrationDelegate(null));
         }
 
         [Fact]
         public void ShouldInvokeMethodOfTypeVoidWithValidServiceCollection()
         {
-            var testPlugin = new ViewActionResultsTestPlugin();
+            var testPlugin = new ControllersViewsTestPlugin();
             var serviceCollection = new ServiceCollection();
 
             testPlugin.DefaultServiceRegistrationDelegate(serviceCollection);