SAVEPOINT

Author: Dennis Doomen

Mockly.Specs/HttpMockSpecs.cs

@@ -77,6 +77,27 @@ await act.Should().ThrowAsync<UnexpectedRequestException>()
                 .WithMessage("Unexpected request to:*GET http://localhost/api/search?q=something with spaces*");
         }
 
+        [Fact]
+        public async Task Can_match_any_query()
+        {
+            // Arrange
+            var mock = new HttpMock();
+
+            mock.ForGet()
+                .WithPath("/api/search")
+                .WithAnyQuery()
+                .RespondsWithStatus(HttpStatusCode.OK);
+
+            // Build step removed;
+            var client = mock.GetClient();
+
+            // Act
+            var response = await client.GetAsync("http://localhost/api/search?q=something with spaces");
+
+            // Assert
+            response.StatusCode.Should().Be(HttpStatusCode.OK);
+        }
+
         [Fact]
         public async Task Supports_spaces_in_the_query()
         {
@@ -98,6 +119,27 @@ public async Task Supports_spaces_in_the_query()
             response.StatusCode.Should().Be(HttpStatusCode.OK);
         }
 
+        [Fact]
+        public async Task The_query_does_not_require_a_question_mark()
+        {
+            // Arrange
+            var mock = new HttpMock();
+
+            mock.ForGet()
+                .WithPath("/api/search")
+                .WithQuery("q=something with spaces")
+                .RespondsWithStatus(HttpStatusCode.OK);
+
+            // Build step removed;
+            var client = mock.GetClient();
+
+            // Act
+            var response = await client.GetAsync("http://localhost/api/search?q=something with spaces");
+
+            // Assert
+            response.StatusCode.Should().Be(HttpStatusCode.OK);
+        }
+
         [Fact]
         public async Task Can_mock_get_request_with_json_response()
         {

Mockly/RequestMockBuilder.cs

@@ -97,10 +97,23 @@ public RequestMockBuilder WithPath(string wildcardPattern)
     /// </summary>
     public RequestMockBuilder WithQuery(string wildcardPattern)
     {
+        if (!wildcardPattern.StartsWith("?", StringComparison.Ordinal))
+        {
+            wildcardPattern = "?" + wildcardPattern;
+        }
+
         queryPattern = wildcardPattern;
         return this;
     }
 
+    /// <summary>
+    /// Configures the request mock to match any query string in the request URI.
+    /// </summary>
+    public RequestMockBuilder WithAnyQuery()
+    {
+        return WithQuery("*");
+    }
+
     /// <summary>
     /// Resets the query string matching to match any query string.
     /// </summary>
@@ -335,11 +348,27 @@ public RequestMockResponseBuilder RespondsWithODataResult<T>(IEnumerable<T> valu
         return new RequestMockResponseBuilder(mock);
     }
 
+    /// <summary>
+    /// Responds with plain text and status code <see cref="HttpStatusCode.OK"/>.
+    /// </summary>
+    public RequestMockResponseBuilder RespondsWithContent(string content)
+    {
+        return RespondsWithContent(HttpStatusCode.OK, content, "text/plain");
+    }
+
     /// <summary>
     /// Responds with raw string content.
     /// </summary>
-    public RequestMockResponseBuilder RespondsWithContent(string content, string contentType = "text/plain",
-        HttpStatusCode statusCode = HttpStatusCode.OK)
+    public RequestMockResponseBuilder RespondsWithContent(HttpStatusCode statusCode, string content)
+    {
+        return RespondsWithContent(statusCode, content, "text/plain");
+    }
+
+    /// <summary>
+    /// Responds with raw string content.
+    /// </summary>
+    public RequestMockResponseBuilder RespondsWithContent(HttpStatusCode statusCode, string content,
+        string contentType)
     {
         var mock = new RequestMock
         {