Merge remote-tracking branch 'upstream/master' into JsonResult

# Conflicts:
#	src/FluentAssertions.AspNetCore.Mvc/FailureMessages.Designer.cs
#	src/FluentAssertions.AspNetCore.Mvc/FailureMessages.resx
#	src/FluentAssertions.AspNetCore.Mvc/FluentAssertions.AspNetCore.Mvc.csproj

Author: faddiv

Diff for: src/FluentAssertions.AspNetCore.Mvc/ActionResultAssertions.cs

@@ -256,6 +256,34 @@ public RedirectToActionResultAssertions BeRedirectToActionResult(string reason,
             return new RedirectToActionResultAssertions(Subject as RedirectToActionResult);
         }
 
+        /// <summary>
+        /// Asserts that the subject is a <see cref="StatusCodeResult"/>.
+        /// </summary>
+        public StatusCodeResultAssertions BeStatusCodeResult()
+        {
+            return BeStatusCodeResult(string.Empty, null);
+        }
+
+        /// <summary>
+        /// Asserts that the subject is a <see cref="StatusCodeResult"/>.
+        /// </summary>
+        /// <param name="reason">
+        /// A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
+        /// is needed. If the phrase does not start with the word <i>because</i>, it is prepended automatically.
+        /// </param>
+        /// <param name="reasonArgs">
+        /// Zero or more objects to format using the placeholders in <see cref="reason" />.
+        /// </param>
+        public StatusCodeResultAssertions BeStatusCodeResult(string reason, params object[] reasonArgs)
+        {
+            Execute.Assertion
+                .BecauseOf(reason, reasonArgs)
+                .ForCondition(Subject is StatusCodeResult)
+                .FailWith(Constants.CommonFailMessage, "StatusCodeResult", Subject.GetType().Name);
+
+            return new StatusCodeResultAssertions(Subject as StatusCodeResult);
+        }
+
         #endregion Public Methods
 
         #region Public Structs

Diff for: src/FluentAssertions.AspNetCore.Mvc/FailureMessages.Designer.cs

@@ -144,6 +144,12 @@
   <data name="RouteData_Values_HaveValue" xml:space="preserve">
     <value>Expected RouteData.Values[{0}] to have value {1}, but found {2}.</value>
   </data>
+  <data name="StatusCodeResultBase_WithStatusCode" xml:space="preserve">
+    <value>Expected status code to be {0} but found {1}.</value>
+  </data>
+  <data name="ViewResultBase_NullModel" xml:space="preserve">
+    <value>Expected Model to be of type {0}, but no Model was supplied.</value>
+  </data>
   <data name="ViewResultBase_ViewData_ContainsKey" xml:space="preserve">
     <value>ViewData does not contain key of {0}.</value>
   </data>

Diff for: src/FluentAssertions.AspNetCore.Mvc/FailureMessages.resx

@@ -0,0 +1,44 @@
+using FluentAssertions.Execution;
+using FluentAssertions.Primitives;
+using Microsoft.AspNetCore.Mvc;
+
+namespace FluentAssertions.AspNetCore.Mvc
+{
+    public class StatusCodeResultAssertions : ObjectAssertions
+    {
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="T:StatusCodeResultAssertions" /> class.
+        /// </summary>
+        /// <param name="subject">The object to test assertion on</param>
+        public StatusCodeResultAssertions(StatusCodeResult subject) : base(subject)
+        {
+        }
+
+        private StatusCodeResult StatusCodeResultSubject => (StatusCodeResult) Subject;
+
+        /// <summary>
+        ///     The model.
+        /// </summary>
+        public int StatusCode => StatusCodeResultSubject.StatusCode;
+
+        /// <summary>
+        ///     Asserts that the status code is the expected status code.
+        /// </summary>
+        /// <param name="expectedStatusCode">The status code.</param>
+        /// <param name="reason">
+        ///     A formatted phrase as is supported by <see cref="string.Format(string,object[])" /> explaining why the assertion
+        ///     is needed. If the phrase does not start with the word <i>because</i>, it is prepended automatically.
+        /// </param>
+        /// <param name="reasonArgs">
+        ///     Zero or more objects to format using the placeholders in <see cref="reason" />.
+        /// </param>
+        public StatusCodeResultAssertions WithStatusCode(int expectedStatusCode, string reason = "", params object[] reasonArgs)
+        {
+            Execute.Assertion
+                .ForCondition(StatusCode == expectedStatusCode)
+                .BecauseOf(reason, reasonArgs)
+                .FailWith(FailureMessages.StatusCodeResultBase_WithStatusCode, expectedStatusCode, StatusCode);
+            return this;
+        }
+    }
+}

Diff for: src/FluentAssertions.AspNetCore.Mvc/StatusCodeResultAssertions.cs

@@ -123,6 +123,22 @@ public void BeView_GivenNotView_ShouldFail()
                 .WithMessage("Expected ActionResult to be \"ViewResult\", but found \"RedirectResult\"");
         }
 
+        [Fact]
+        public void BeStatusCodeResult_GivenStatusCodeResult_ShouldPass()
+        {
+            ActionResult result = new StatusCodeResult(200);
+            result.Should().BeStatusCodeResult();
+        }
+
+        [Fact]
+        public void BeStatusCodeResult_GivenNotStatusCodeResult_ShouldFail()
+        {
+            ActionResult result = new RedirectResult("/");
+            Action a = () => result.Should().BeStatusCodeResult();
+            a.Should().Throw<Exception>()
+                .WithMessage("Expected ActionResult to be \"StatusCodeResult\", but found \"RedirectResult\"");
+        }
+
         #endregion Public Methods
     }
 }

Diff for: tests/FluentAssertions.AspNetCore.Mvc.Tests/ActionResultAssertions_Tests.cs

@@ -0,0 +1,45 @@
+using FluentAssertions.Mvc.Tests.Fakes;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using Xunit;
+
+namespace FluentAssertions.AspNetCore.Mvc.Tests
+{
+    public class StatusCodeResultAssertions_Tests
+    {
+        #region Private Fields
+
+        private FakeController _controller = new FakeController();
+
+        #endregion Private Fields
+
+        #region Public Methods
+
+        [Fact]
+        public void WithStatusCode_GivenExpectedValue_ShouldPass()
+        {
+            int statusCode = 200;
+
+            ActionResult result = new StatusCodeResult(statusCode);
+
+            result.Should().BeStatusCodeResult().WithStatusCode(statusCode);
+        }
+
+        [Fact]
+        public void WithStatusCode_GivenUnexpectedValue_ShouldFail()
+        {
+            int actualStatusCode = 200;
+            int expectedStatusCode = 400;
+
+            var failureMessage = string.Format(FailureMessages.StatusCodeResultBase_WithStatusCode, expectedStatusCode, actualStatusCode);
+            ActionResult result = new StatusCodeResult(actualStatusCode);
+
+            Action action = () => result.Should().BeStatusCodeResult().WithStatusCode(expectedStatusCode);
+
+            action.Should().Throw<Exception>()
+                .WithMessage(failureMessage);
+        }
+
+        #endregion Public Methods
+    }
+}