Cleared the strange API calls (closes #81)

Author: ivaylokenov

README.md

@@ -189,7 +189,8 @@ MyMvc
 		.ChangingActionNameTo("AnotherAction"));
 
 // tests whether model state error exists by using lambda expression
-// and specific tests for the error messages
+// and with specific tests for the error messages
+// and tests whether the action return view with the same request model
 MyMvc
 	.Controller<MvcController>()
 	.Calling(c => c.MyAction(requestWithErrors))
@@ -198,7 +199,10 @@ MyMvc
 		.ContainingNoErrorFor(m => m.NonRequiredProperty)
 		.AndAlso()
 		.ContainingErrorFor(m => m.RequiredProperty)
-		.ThatEquals("The RequiredProperty field is required."));
+		.ThatEquals("The RequiredProperty field is required."))
+	.AndAlso()
+	.ShouldReturn()
+	.View(requestWithErrors);
 
 // tests whether the action throws
 // with exception of certain type and with certain message

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/Base/IBaseTestBuilderWithComponentShouldHaveTestBuilder.cs

@@ -1,6 +1,6 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Base
 {
-    public interface IBaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder> : IBaseTestBuilderWithComponent
+    public interface IBaseTestBuilderWithComponentShouldHaveTestBuilder<TBuilder> : IBaseTestBuilder
         where TBuilder : IBaseTestBuilder
     {
     }

src/MyTested.AspNetCore.Mvc.Controllers/Builders/And/AndActionResultTestBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/AndActionResultTestBuilder.cs

@@ -1,17 +1,15 @@
-namespace MyTested.AspNetCore.Mvc.Builders.And
+namespace MyTested.AspNetCore.Mvc.Builders.Actions
 {
-    using Actions;
-    using Base;
+    using ShouldHave;
     using Contracts.Actions;
-    using Contracts.And;
     using Internal;
     using Internal.TestContexts;
 
     /// <summary>
     /// Class containing AndAlso() method allowing additional assertions after action tests.
     /// </summary>
     /// <typeparam name="TActionResult">Result from invoked action in ASP.NET Core MVC controller.</typeparam>
-    public class AndActionResultTestBuilder<TActionResult> : BaseTestBuilderWithActionResult<TActionResult>,
+    public class AndActionResultTestBuilder<TActionResult> : ShouldHaveTestBuilder<TActionResult>,
         IAndActionResultTestBuilder<TActionResult>
     {
         /// <summary>

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldHave/ShouldHaveActionAttributes.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using Attributes;
-    using Contracts.And;
+    using Contracts.Actions;
     using Contracts.Attributes;
     using Exceptions;
     using Utilities.Extensions;

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Actions/ShouldHave/ShouldHaveTestBuilder.cs

@@ -1,10 +1,8 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Actions.ShouldHave
 {
-    using System;
-    using And;
+    using Actions;
     using Base;
     using Contracts.Actions;
-    using Contracts.And;
     using Internal.TestContexts;
     using Utilities.Validators;
 

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/And/IAndActionResultTestBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Actions/IAndActionResultTestBuilder.cs

@@ -1,13 +1,10 @@
-namespace MyTested.AspNetCore.Mvc.Builders.Contracts.And
+namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Actions
 {
-    using Actions;
-    using Base;
-
     /// <summary>
     /// Contains AndAlso() method allowing additional assertions after the action result tests.
     /// </summary>
     /// <typeparam name="TActionResult">Result from invoked action in ASP.NET Core MVC controller.</typeparam>
-    public interface IAndActionResultTestBuilder<TActionResult> : IBaseTestBuilderWithActionResult<TActionResult>
+    public interface IAndActionResultTestBuilder<TActionResult> : IShouldHaveTestBuilder<TActionResult>
     {
         /// <summary>
         /// Method allowing additional assertions after the action tests.

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Actions/IShouldHaveTestBuilder.cs

@@ -1,7 +1,6 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Actions
 {
     using System;
-    using And;
     using Attributes;
     using Base;
 

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Actions/IShouldReturnTestBuilder.cs

@@ -21,7 +21,7 @@
     /// Used for testing returned action result.
     /// </summary>
     /// <typeparam name="TActionResult">Result from invoked action in ASP.NET Core MVC controller.</typeparam>
-    public interface IShouldReturnTestBuilder<TActionResult> : IBaseTestBuilderWithActionResult<TActionResult>
+    public interface IShouldReturnTestBuilder<TActionResult>
     {
         /// <summary>
         /// Tests whether the action result is the default value of the type.

src/MyTested.AspNetCore.Mvc.Controllers/Builders/Contracts/Actions/IShouldThrowTestBuilder.cs

@@ -1,12 +1,11 @@
 namespace MyTested.AspNetCore.Mvc.Builders.Contracts.Actions
 {
-    using Base;
     using ExceptionErrors;
 
     /// <summary>
     /// Used for testing whether the action throws exception.
     /// </summary>
-    public interface IShouldThrowTestBuilder : IBaseTestBuilderWithInvokedAction
+    public interface IShouldThrowTestBuilder
     {
         /// <summary>
         /// Tests whether the action throws any exception.

test/MyTested.AspNetCore.Mvc.Controllers.Test/BuildersTests/ActionResultsTests/OkTests/OkTestBuilderTests.cs

@@ -47,6 +47,9 @@ public void WithResponseModelShouldWorkCorrectly()
             MyController<MvcController>
                 .Instance()
                 .Calling(c => c.OkResultWithResponse())
+                .ShouldHave()
+                .NoActionAttributes()
+                .AndAlso()
                 .ShouldReturn()
                 .Ok()
                 .WithModelOfType<List<ResponseModel>>();