ShouldPassForThe now recognizes the model objects earlier in the assertion chain (#359)

Author: ivaylokenov

src/MyTested.AspNetCore.Mvc.Controllers.Views/Builders/ActionResults/View/BaseTestBuilderWithViewFeatureResult.cs

@@ -8,6 +8,7 @@
     using Exceptions;
     using Internal;
     using Internal.Contracts.ActionResults;
+    using Utilities.Extensions;
 
     /// <summary>
     /// Base class for all test builders with view features.
@@ -48,13 +49,7 @@ protected BaseTestBuilderWithViewFeatureResult(
         public abstract TViewFeatureResultTestBuilder ResultTestBuilder { get; }
 
         public override object GetActualModel()
-            => this.ActionResult switch
-            {
-                ViewResult viewResult => viewResult.Model,
-                PartialViewResult partialViewResult => partialViewResult.ViewData?.Model,
-                ViewComponentResult viewComponentResult => viewComponentResult.ViewData?.Model,
-                _ => this.ActionResult
-            };
+            => this.ActionResult.AsDynamic().Model;
 
         public override void ValidateNoModel()
         {

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldReturn/ShouldReturnStatusCode.cs

@@ -5,9 +5,7 @@
     using And;
     using Contracts.ActionResults.StatusCode;
     using Contracts.And;
-    using Exceptions;
     using Microsoft.AspNetCore.Mvc;
-    using Utilities.Extensions;
     using Utilities.Validators;
 
     /// <content>

src/MyTested.AspNetCore.Mvc.Controllers/Plugins/ControllersTestPlugin.cs

@@ -3,6 +3,7 @@
     using System;
     using Microsoft.Extensions.DependencyInjection;
     using Internal.TestContexts;
+    using Microsoft.AspNetCore.Mvc;
     using Utilities;
 
     public class ControllersTestPlugin : BaseTestPlugin, IDefaultRegistrationPlugin, IServiceRegistrationPlugin, IShouldPassForPlugin
@@ -22,7 +23,10 @@ public object TryGetValue(Type type, ComponentTestContext testContext)
             => Reflection.AreAssignable(this.controllerAttributesType, type) // ControllerAttributes
                 ? new ControllerAttributes(testContext.ComponentAttributes)
                 : Reflection.AreAssignable(this.actionAttributesType, type) // ActionAttributes
-                ? (object)new ActionAttributes(testContext.MethodAttributes)
+                ? new ActionAttributes(testContext.MethodAttributes)
+                : testContext.MethodResult is ObjectResult objectResult // ObjectResult Model
+                    && Reflection.AreAssignable(type, objectResult.Value?.GetType())
+                ? objectResult.Value
                 : null;
     }
 }

test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/BuildersTests/ActionResultsTests/BadRequestTests/BadRequestTestBuilderTests.cs

@@ -1,17 +1,19 @@
 namespace MyTested.AspNetCore.Mvc.Test.BuildersTests.ActionResultsTests.BadRequestTests
 {
+    using System.Collections.Generic;
     using Microsoft.AspNetCore.Mvc;
     using Setups.Controllers;
+    using Setups.Models;
     using Xunit;
 
     public class BadRequestTestBuilderTests
     {
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectly()
+        public void ShouldPassForTheShouldWorkCorrectlyWithActionResult()
         {
             MyController<MvcController>
                 .Instance()
-                .Calling(c => c.FullHttpBadRequestAction())
+                .Calling(c => c.FullBadRequestAction())
                 .ShouldReturn()
                 .BadRequest()
                 .AndAlso()
@@ -21,5 +23,17 @@ public void AndProvideTheActionResultShouldWorkCorrectly()
                     Assert.IsAssignableFrom<BadRequestObjectResult>(actionResult);
                 });
         }
+
+        [Fact]
+        public void ShouldPassForTheShouldWorkCorrectlyWithModel()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.FullBadRequestAction())
+                .ShouldReturn()
+                .BadRequest()
+                .AndAlso()
+                .ShouldPassForThe<ICollection<ResponseModel>>(model => model.Count == 2);
+        }
     }
 }

test/MyTested.AspNetCore.Mvc.Controllers.ActionResults.Test/BuildersTests/ActionResultsTests/NotFoundTests/NotFoundTestBuilderTests.cs

@@ -7,7 +7,7 @@
     public class ChallengeTestBuilderTests
     {
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectly()
+        public void ShouldPassForTheShouldWorkCorrectly()
         {
             MyController<MvcController>
                 .Instance()

test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/ActionResultsTests/BadRequestTests/BadRequestTestBuilderTests.cs

@@ -7,7 +7,7 @@
     public class ContentTestBuilderTests
     {
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectly()
+        public void ShouldPassForTheShouldWorkCorrectly()
         {
             MyController<MvcController>
                 .Instance()

test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/ActionResultsTests/ChallengeTests/ChallengeTestBuilderTests.cs

@@ -1,13 +1,15 @@
 namespace MyTested.AspNetCore.Mvc.Test.BuildersTests.ActionResultsTests.CreatedTests
 {
+    using System.Collections.Generic;
     using Microsoft.AspNetCore.Mvc;
     using Setups.Controllers;
+    using Setups.Models;
     using Xunit;
 
     public class CreatedTestBuilderTests
     {
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectly()
+        public void ShouldPassForTheShouldWorkCorrectlyWithActionResult()
         {
             MyController<MvcController>
                 .Instance()
@@ -20,5 +22,16 @@ public void AndProvideTheActionResultShouldWorkCorrectly()
                     Assert.IsAssignableFrom<CreatedResult>(actionResult);
                 });
         }
+
+        [Fact]
+        public void ShouldPassForTheShouldWorkCorrectlyWithModel()
+        {
+            MyController<MvcController>
+                .Instance()
+                .Calling(c => c.CreatedAction())
+                .ShouldReturn()
+                .Created()
+                .ShouldPassForThe<ICollection<ResponseModel>>(model => model.Count == 2);
+        }
     }
 }

test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/ActionResultsTests/ContentTests/ContentTestBuilderTests.cs

@@ -7,7 +7,7 @@
     public class FileTestBuilderTests
     {
         [Fact]
-        public void AndProvideTheActionResultShouldWorkCorrectly()
+        public void ShouldPassForTheShouldWorkCorrectly()
         {
             MyController<MvcController>
                 .Instance()