Support for querystring in scripts

Author: codeape2

UnitTests/TestDynamicResponse.cs

@@ -42,6 +42,12 @@ public void CanAccessGlobalVariables()
             Assert.Equal("foobar", Eval("RequestBody + RequestPath", new RequestInfo { RequestBody = "foo", RequestPath = "bar" }));
         }
 
+        [Fact]
+        public void CanAccessQueryString()
+        {
+            Assert.Equal("foobar?ama", Eval("RequestBody + RequestPath + QueryString", new RequestInfo { RequestBody = "foo", RequestPath = "bar", QueryString = "?ama" }));
+        }
+
         [Fact]
         public void MultilineScript()
         {

UnitTests/TestTestCommand.cs

@@ -100,6 +100,7 @@ public TestTestCommand()
         {
             dc = new DirectoryCreator();
             dc.AddFile("endpoint1\\endpoint.json", TESTCOMMAND_CONSTANTS.ENDPOINTJSON);
+            dc.AddFile("endpoint1\\myscript.csscript", "return \"Hello world\";");
             dc.AddFile("endpoint1\\content.txt", "FOOBARBOOBAR");
             dc.AddFile("tests\\tests.json", TESTCOMMAND_CONSTANTS.TESTS);
             dc.AddFile("tests\\example.txt", "FOOBARBOOBAR");
@@ -129,6 +130,22 @@ public void CanReadTestsFromJSONFile()
             Assert.Equal("FOOBARBOOBAR", test.ExpectedResponseBody);
         }
 
+        [Fact]
+        async public void RequestBodyCanBeUnspecified()
+        {
+            var endpointCollection = EndpointCollectionReader.ReadFromDirectory(dc.DirectoryName);
+
+            var test = new NetmockeryTestCase
+            {
+                RequestPath = "/foo/",
+                ExpectedRequestMatcher = "Any request",
+                ExpectedResponseBody = "Hello world"
+            };
+
+            var result = await test.ExecuteAsync(endpointCollection, false);
+            Assert.True(result.OK, result.Message);
+        }
+
         [Fact]
         public void RequestBodyCanBeReadFromFile()
         {

netmockery/NetmockeryTestCase.cs

@@ -12,29 +12,20 @@ namespace netmockery
     public class TestCaseHttpRequest : IHttpRequestWrapper
     {
         private string path;
+        private string querystring;
         private HeaderDictionary headerDictionary = new HeaderDictionary();
 
-        public TestCaseHttpRequest(string path)
+        public TestCaseHttpRequest(string path, string querystring)
         {
             this.path = path;
-        }
-        
-        public IHeaderDictionary Headers
-        {
-            get
-            {
-                return headerDictionary;
-            }
+            this.querystring = querystring;
         }
 
-        public PathString Path
-        {
-            get
-            {
+        public IHeaderDictionary Headers => headerDictionary;
 
-                return new PathString(path);
-            }
-        }
+        public PathString Path => new PathString(path);
+
+        public QueryString QueryString => new QueryString(querystring);
     }
 
     public class TestCaseHttpResponse : IHttpResponseWrapper
@@ -44,13 +35,7 @@ public class TestCaseHttpResponse : IHttpResponseWrapper
         Encoding writtenEncoding;
         string contentType;
 
-        public Stream Body
-        {
-            get
-            {
-                return memoryStream;
-            }
-        }
+        public Stream Body => memoryStream;
 
         public string ContentType
         {
@@ -62,12 +47,12 @@ public string ContentType
 
         async public Task WriteAsync(string content, Encoding encoding)
         {
-
             writtenContent = content;
             writtenEncoding = encoding;
             await Task.Yield();
         }
     }
+
     public class NetmockeryTestCase
     {
         public string Name;
@@ -145,7 +130,7 @@ async public Task<NetmockeryTestCaseResult> ExecuteAsync(EndpointCollection endp
                 else
                 {
                     bool singleMatch;
-                    var matcher_and_creator = endpoint.Resolve(new PathString(RequestPath), new QueryString(QueryString), RequestBody, null, out singleMatch);
+                    var matcher_and_creator = endpoint.Resolve(new PathString(RequestPath), new QueryString(QueryString), RequestBody ?? "", null, out singleMatch);
                     if (matcher_and_creator != null)
                     {
                         var responseCreator = matcher_and_creator.Item2;
@@ -158,7 +143,7 @@ async public Task<NetmockeryTestCaseResult> ExecuteAsync(EndpointCollection endp
                         {
                             if (NeedsResponseBody)
                             {
-                                var responseBodyBytes = await responseCreator.CreateResponseAsync(new TestCaseHttpRequest(RequestPath), Encoding.UTF8.GetBytes(RequestBody), new TestCaseHttpResponse(), endpoint.Directory);
+                                var responseBodyBytes = await responseCreator.CreateResponseAsync(new TestCaseHttpRequest(RequestPath, QueryString), Encoding.UTF8.GetBytes(RequestBody ?? ""), new TestCaseHttpResponse(), endpoint.Directory);
                                 responseBody = Encoding.UTF8.GetString(responseBodyBytes);
                             }
                             string message;
@@ -197,7 +182,7 @@ async public Task<Tuple<string, string>> GetResponseAsync(EndpointCollection end
             if (matcher_and_creator != null)
             {
                 var responseCreator = matcher_and_creator.Item2;
-                var responseBodyBytes = await responseCreator.CreateResponseAsync(new TestCaseHttpRequest(RequestPath), Encoding.UTF8.GetBytes(RequestBody), new TestCaseHttpResponse(), endpoint.Directory);
+                var responseBodyBytes = await responseCreator.CreateResponseAsync(new TestCaseHttpRequest(RequestPath, QueryString), Encoding.UTF8.GetBytes(RequestBody), new TestCaseHttpResponse(), endpoint.Directory);
                 return Tuple.Create(Encoding.UTF8.GetString(responseBodyBytes), (string)null);
             }
             else

netmockery/ResponseCreator.cs

@@ -21,6 +21,7 @@ public interface IHttpResponseWrapper
     public interface IHttpRequestWrapper
     {
         PathString Path { get; }
+        QueryString QueryString { get; }
         IHeaderDictionary Headers { get; }
     }
 
@@ -33,21 +34,9 @@ public HttpRequestWrapper(HttpRequest httpRequest)
             Debug.Assert(httpRequest != null);
             this.httpRequest = httpRequest;
         }
-        public IHeaderDictionary Headers
-        {
-            get
-            {
-                return httpRequest.Headers;
-            }
-        }
-
-        public PathString Path
-        {
-            get
-            {
-                return httpRequest.Path;
-            }
-        }
+        public IHeaderDictionary Headers => httpRequest.Headers;
+        public PathString Path => httpRequest.Path;
+        public QueryString QueryString => httpRequest.QueryString;
     }
 
     public class HttpResponseWrapper : IHttpResponseWrapper
@@ -87,8 +76,9 @@ public interface IResponseCreatorWithFilename
 
     public class RequestInfo
     {
-        public string RequestBody;
         public string RequestPath;
+        public string QueryString;
+        public string RequestBody;
         public IHeaderDictionary Headers;
         public string EndpointDirectory;
     }
@@ -111,8 +101,9 @@ public override async Task<byte[]> CreateResponseAsync(IHttpRequestWrapper reque
         {
             var responseBody = GetBodyAndExecuteReplacements(new RequestInfo
             {
-                RequestBody = Encoding.UTF8.GetString(requestBody),
                 RequestPath = request.Path.ToString(),
+                QueryString = request.QueryString.ToString(),
+                RequestBody = Encoding.UTF8.GetString(requestBody),                
                 Headers = request.Headers,
                 EndpointDirectory = endpointDirectory
             });