Merge branch 'development' into version-3.1

Author: ivaylokenov

README.md

@@ -19,6 +19,11 @@
 <table>
   <tbody>
     <tr>
+      <td align="center" valign="middle">
+          <a href="https://bit.ly/ciu-zuehlke" target="_blank">
+          <img width="148px" src="https://user-images.githubusercontent.com/3391906/84595391-4ec75080-ae60-11ea-8bc4-2b5e4b17a345.jpg">
+        </a>
+      </td>
       <td align="center" valign="middle">
         <a href="https://softuni.org/" target="_blank">
           <img width="148px" src="https://softuni.foundation/wp-content/uploads/2017/08/SoftUni_Foundation_Logo_Oneline-1.png">
@@ -52,6 +57,25 @@
   </tbody>
 </table>
 
+## Special Sponsors
+
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+          <a href="http://bit.ly/bellatrixsolutions" target="_blank">
+    <img width="148px" src="https://user-images.githubusercontent.com/3391906/68993273-d4f5c700-087e-11ea-9b39-e173733fcbfb.png" alt="The Ultimate Cross-Platform .NET Framework">
+          </a>
+      </td>
+      <td align="center" valign="middle">
+          <a href="https://www.jetbrains.com/?from=MyTestedASP.NET" target="_blank">
+    <img width="148px" src="https://user-images.githubusercontent.com/3391906/72542498-ee21f080-388c-11ea-92ac-0b0153028933.png" alt="JetBrains">
+          </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
 ## Project Description
 
 **MyTested.AspNetCore.Mvc** is a strongly-typed unit testing library providing an easy fluent interface to test the [ASP.NET Core](https://github.com/aspnet/AspNetCore) framework, perfectly suitable for both MVC and API scenarios. It is testing framework agnostic so that you can combine it with a test runner of your choice (e.g. [xUnit](https://github.com/xunit/xunit), [NUnit](https://github.com/nunit/nunit), etc.). 

docs/_docfx/tutorial/helpers.md

@@ -186,7 +186,8 @@ public void AddressAndPaymentShouldRerurnRedirectWithValidData(
 
 Running this test will give us the following strange error message:
 
-``` When calling AddressAndPayment action in CheckoutController expected redirect result to have resolved location to '/Checkout/Complete/1', but in fact received '/Home/Complete/1'.
+``` 
+When calling AddressAndPayment action in CheckoutController expected redirect result to have resolved location to '/Checkout/Complete/1', but in fact received '/Home/Complete/1'.
 ```
 
 The problem is that the request path is empty which makes the action route data being invalid. For that reason, we are receiving wrong redirection location. The fix is easy - just call **"WithRouteData"**:

docs/_docfx/tutorial/routing.md

@@ -51,7 +51,7 @@ The simplest route test possible:
 
 ```c#
 [Fact]
-public void GetErrorActionShouldBeRoutedSuccessfuly()
+public void GetErrorActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap("/Home/Error")
@@ -71,11 +71,11 @@ public async Task<IActionResult> AddToCart(int id)
 }
 ```
 
-Create **"ShoppingCartRouteTest""** class and add the following test:
+Create **"ShoppingCartRouteTest"** class and add the following test:
 
 ```c#
 [Fact]
-public void GetAddToCartActionShouldBeRoutedSuccessfuly()
+public void GetAddToCartActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap("/ShoppingCart/AddToCart/1")
@@ -91,11 +91,11 @@ public async Task<IActionResult> Browse(string genre)
 }
 ```
 
-Create **"StoreRouteTest""** class and add the following test:
+Create **"StoreRouteTest"** class and add the following test:
 
 ```c#
 [Fact]
-public void GetBrowseActionShouldBeRoutedSuccessfuly()
+public void GetBrowseActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap("/Store/Browse?genre=HipHop")
@@ -125,7 +125,7 @@ We do not want to test the **"MusicStoreContext"** and the **"IMemoryCache"** ac
 
 ```c#
 [Fact]
-public void GetIndexActionShouldBeRoutedSuccessfuly()
+public void GetIndexActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap("/Home")
@@ -154,7 +154,7 @@ The following test will fail right away:
 
 ```c#
 [Fact]
-public void PostRemoveFromCartActionShouldBeRoutedSuccessfuly()
+public void PostRemoveFromCartActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap("/ShoppingCart/RemoveFromCart/1")
@@ -167,7 +167,7 @@ We are testing with HTTP Get request while the action is restricted only for HTT
 
 ```c#
 [Fact]
-public void PostRemoveFromCartActionShouldBeRoutedSuccessfuly()
+public void PostRemoveFromCartActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap(request => request // <---
@@ -225,7 +225,7 @@ Let's update the test to make it pass:
 
 ```c#
 [Fact]
-public void PostRemoveFromCartActionShouldBeRoutedSuccessfuly()
+public void PostRemoveFromCartActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap(request => request
@@ -245,7 +245,7 @@ Let's test a **"CheckoutController"** action, because all actions in that contro
 
 ```c#
 [Fact]
-public void GetAddressAndPaymentActionShouldBeRoutedSuccessfuly()
+public void GetAddressAndPaymentActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap(request => request
@@ -290,7 +290,7 @@ Let's test that route! In **"Routing"**, create an **"Admin"** folder. In it cre
 
 ```c#
 [Fact]
-public void GetIndexActionShouldBeRoutedSuccessfuly()
+public void GetIndexActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap(request => request
@@ -320,7 +320,7 @@ The login view model should come from the request form so we may decide to ignor
 
 ```c#
 [Fact]
-public void PostLoginActionShouldBeRoutedSuccessfuly()
+public void PostLoginActionShouldBeRoutedSuccessfully()
     => MyRouting
         .Configuration()
         .ShouldMap(request => request

docs/_docfx/tutorial/viewcomponents.md

@@ -118,9 +118,7 @@ MyViewComponent<CartSummaryComponent>
     .Instance()
     .WithSession(session => session
         .WithEntry("Session", "TestCart"))
-    .WithData(db => db
-        .WithEntities(entities => entities
-            .AddRange(GetCartItems("TestCart", "TestAlbum"))))
+    .WithData(CartItemData.GetMany("TestCart", "TestAlbum"))
     .InvokedWith(vc => vc.InvokeAsync()) // <---
 ```
 
@@ -133,9 +131,7 @@ MyViewComponent<CartSummaryComponent>
     .Instance()
     .WithSession(session => session
         .WithEntry("Session", "TestCart"))
-    .WithData(db => db
-        .WithEntities(entities => entities
-            .AddRange(GetCartItems("TestCart", "TestAlbum"))))
+    .WithData(CartItemData.GetMany("TestCart", "TestAlbum"))
     .InvokedWith(vc => vc.InvokeAsync())
     .ShouldHave() // <---
     .ViewBag(viewBag => viewBag

src/MyTested.AspNetCore.Mvc.Abstractions/Builders/Contracts/Attributes/IBaseAttributesTestBuilder.cs

@@ -41,5 +41,12 @@ TAttributesTestBuilder PassingFor<TAttribute>(Action<TAttribute> assertions)
         /// <returns>The same attributes test builder.</returns>
         TAttributesTestBuilder PassingFor<TAttribute>(Func<TAttribute, bool> predicate)
             where TAttribute : Attribute;
+
+
+        /// <summary>
+        /// Adds inherited attributes.
+        /// </summary>
+        /// <returns>The same attributes test builder.</returns>
+        TAttributesTestBuilder IncludingInherited();
     }
 }

src/MyTested.AspNetCore.Mvc.Abstractions/Internal/TestContexts/ComponentTestContext.cs

@@ -22,8 +22,11 @@ public abstract class ComponentTestContext : HttpTestContext
 
         public object Component => this.component ??= this.ComponentConstructionDelegate();
 
-        public IEnumerable<object> ComponentAttributes 
-            => this.componentAttributes ??= Reflection.GetCustomAttributes(this.Component);
+        public IEnumerable<object> ComponentAttributes
+        {
+            get => this.componentAttributes ??= Reflection.GetCustomAttributes(this.Component);
+            private set => this.componentAttributes = value;
+        }
 
         public IDictionary<Type, object> AggregatedDependencies 
             => this.aggregatedDependencies ??= new Dictionary<Type, object>();
@@ -66,27 +69,20 @@ public LambdaExpression MethodCall
         public object MethodResult
         { 
             get => this.methodResult;
-
             set => this.methodResult = this.ConvertMethodResult(value);
         }
 
-        public IEnumerable<object> MethodAttributes 
-            => this.methodAttributes ??= Reflection.GetCustomAttributes(this.Method);
+        public IEnumerable<object> MethodAttributes
+        {
+            get => this.methodAttributes ??= Reflection.GetCustomAttributes(this.Method);
+            private set => this.methodAttributes = value;
+        }
 
         public Exception CaughtException { get; set; }
 
         public object Model
         {
-            get
-            {
-                if (this.model == null)
-                {
-                    return this.MethodResult;
-                }
-
-                return this.model;
-            }
-
+            get => this.model ?? this.MethodResult;
             set => this.model = value;
         }
 
@@ -116,6 +112,12 @@ public void Apply<TMethodResult>(InvocationTestContext<TMethodResult> invocation
             this.CaughtException = invocationTestContext.CaughtException;
         }
 
+        public void IncludeInheritedComponentAttributes()
+            => this.ComponentAttributes = Reflection.GetCustomAttributes(this.Component, true);
+
+        public void IncludeInheritedMethodAttributes()
+            => this.MethodAttributes = Reflection.GetCustomAttributes(this.Method, true);
+
         protected virtual object ConvertMethodResult(object convertibleMethodResult) => convertibleMethodResult;
     }
 }