Merge pull request #56 from crupest/dev

Refactor API to be RESTful.

1 files changed, 10 insertions, 2 deletions

diff --git a/Timeline.Tests/Helpers/ResponseAssertions.cs b/Timeline.Tests/Helpers/ResponseAssertions.cs
index 301ceef6..f01a0677 100644
--- a/Timeline.Tests/Helpers/ResponseAssertions.cs
+++ b/Timeline.Tests/Helpers/ResponseAssertions.cs
@@ -3,6 +3,7 @@ using FluentAssertions.Execution;
 using FluentAssertions.Formatting;

 using FluentAssertions.Primitives;

 using System;

+using System.Globalization;

 using System.Net;

 using System.Net.Http;

 using System.Text;

@@ -124,6 +125,13 @@ namespace Timeline.Tests.Helpers
             return assertions.HaveJsonBody<CommonResponse>(because, becauseArgs);

         }

 

+        public static void HaveCommonBody(this HttpResponseMessageAssertions assertions, int code, string message = null, params object[] messageArgs)

+        {

+            message = string.IsNullOrEmpty(message) ? "" : ", " + string.Format(CultureInfo.CurrentCulture, message, messageArgs);

+            var body = assertions.HaveCommonBody("Response body should be CommonResponse{0}", message).Which;

+            body.Code.Should().Be(code, "Response body code is not the specified one{0}", message);

+        }

+

         public static AndWhichConstraint<HttpResponseMessageAssertions, CommonDataResponse<TData>> HaveCommonDataBody<TData>(this HttpResponseMessageAssertions assertions, string because = "", params object[] becauseArgs)

         {

             return assertions.HaveJsonBody<CommonDataResponse<TData>>(because, becauseArgs);

@@ -152,9 +160,9 @@ namespace Timeline.Tests.Helpers
             message = string.IsNullOrEmpty(message) ? "" : ", " + message;

             assertions.HaveStatusCode(400, "Invalid Model Error must have 400 status code{0}", message)

                 .And.HaveCommonBody("Invalid Model Error must have CommonResponse body{0}", message)

-                .Which.Code.Should().Be(ErrorCodes.Http.Common.InvalidModel,

+                .Which.Code.Should().Be(ErrorCodes.Common.InvalidModel,

                 "Invalid Model Error must have code {0} in body{1}",

-                ErrorCodes.Http.Common.InvalidModel, message);

+                ErrorCodes.Common.InvalidModel, message);

         }

     }

 }