allow to set HTTP status code by server in setAPIExpectations

Author: MartinNowak

test/appveyor.d

@@ -20,9 +20,9 @@ unittest
             j["builds"] = j["builds"][0..2];
         },
         "/appveyor/builds/greenify/dmd/13074433/cancel",
+        HTTPStatus.noContent,
         (scope HTTPServerRequest req, scope HTTPServerResponse res) {
             assert(req.method == HTTPMethod.DELETE);
-            res.statusCode = 204;
             res.writeVoidBody;
         },
     );

test/comments.d

@@ -186,7 +186,6 @@ unittest
         "/github/repos/dlang/phobos/issues/4921/labels/auto-merge",
         (scope HTTPServerRequest req, scope HTTPServerResponse res){
             assert(req.method == HTTPMethod.DELETE);
-            res.statusCode = 200;
         },
         "/github/repos/dlang/phobos/issues/4921/comments",
         "/github/orgs/dlang/public_members?per_page=100",
@@ -289,7 +288,6 @@ unittest
         "/github/repos/dlang/phobos/issues/5519/labels/auto-merge",
         (scope HTTPServerRequest req, scope HTTPServerResponse res){
             assert(req.method == HTTPMethod.DELETE);
-            res.statusCode = 200;
         },
         "/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
         "/github/repos/dlang/phobos/issues/5519/comments",

test/labels.d

@@ -10,7 +10,8 @@ unittest
     postGitHubHook("dlang_phobos_label_4921.json", "pull_request",
         (ref Json j, scope HTTPClientRequest req){
             j["pull_request"]["state"] = "open";
-    }.toDelegate);
+        }
+    );
 }
 
 @("ignore-auto-merge-on-closed")
@@ -39,20 +40,22 @@ unittest
             j[1]["label"]["name"] = "auto-merge";
         },
         "/github/users/9il",
-        "/github/repos/dlang/phobos/pulls/4921/merge", (scope HTTPServerRequest req, scope HTTPServerResponse res) {
+        "/github/repos/dlang/phobos/pulls/4921/merge",
+        HTTPStatus.methodNotAllowed,
+        (scope HTTPServerRequest req, scope HTTPServerResponse res) {
             // https://developer.github.com/v3/pulls/#response-if-merge-cannot-be-performed
             assert(req.json["sha"] == "d2c7d3761b73405ee39da3fd7fe5030dee35a39e");
             assert(req.json["merge_method"] == "merge");
             assert(req.json["commit_message"] == "Issue 8573 - A simpler Phobos function that returns the index of the …\n"~
                    "merged-on-behalf-of: Ilya Yaroshenko <testmail@example.com>");
-            res.statusCode = 405;
         }
     );
 
     postGitHubHook("dlang_phobos_label_4921.json", "pull_request",
         (ref Json j, scope HTTPClientRequest req){
             j["pull_request"]["state"] = "open";
-    }.toDelegate);
+        }
+    );
 }
 
 @("succeed-to-auto-merge-squash")
@@ -74,7 +77,6 @@ unittest
             assert(req.json["merge_method"] == "squash");
             assert(req.json["commit_message"] == "Issue 8573 - A simpler Phobos function that returns the index of the …\n"~
                    "merged-on-behalf-of: Ilya Yaroshenko <testmail@example.com>");
-            res.statusCode = 200;
         }
     );
 
@@ -144,7 +146,6 @@ unittest
             assert(req.json["merge_method"] == "merge");
             assert(req.json["commit_message"] == "Remove deprecated stdc import\n" ~
                     "merged-on-behalf-of: Sebastian Wilzbach <wilzbach@users.noreply.github.com>");
-            res.statusCode = 200;
         }
     );
 

test/review.d

@@ -13,7 +13,6 @@ unittest
             assert(req.json["merge_method"] == "merge");
             assert(req.json["commit_message"] == "Fix tan returning -nan for inputs where abs(x) >= 2^63\n"~
                    "merged-on-behalf-of: ZombineDev <ZombineDev@users.noreply.github.com>");
-            res.statusCode = 200;
         }
     );
 

test/status.d

@@ -70,7 +70,6 @@ unittest
             assert(req.json["merge_method"] == "merge");
             assert(req.json["commit_message"] == "Fix issue 16977 - bad debug info for function default arguments\n"~
                    "merged-on-behalf-of: unknown");
-            res.statusCode = 200;
         }
     );
 
@@ -101,7 +100,6 @@ unittest
             assert(req.json["merge_method"] == "squash");
             assert(req.json["commit_message"] == "taking address of local means it cannot be 'scope' later\n"~
                    "merged-on-behalf-of: Martin Nowak <somemail@example.org>");
-            res.statusCode = 200;
         }
     );
 
@@ -130,7 +128,6 @@ unittest
             assert(req.json["merge_method"] == "merge");
             assert(req.json["commit_message"] == "Fix issue 16977 - bad debug info for function default arguments\n"~
                    "merged-on-behalf-of: unknown");
-            res.statusCode = 200;
         },
         "/github/repos/dlang/dmd/pulls/6328/commits",
         "/github/repos/dlang/dmd/issues/6328/events",
@@ -141,7 +138,6 @@ unittest
             assert(req.json["merge_method"] == "squash");
             assert(req.json["commit_message"] == "taking address of local means it cannot be 'scope' later\n"~
                    "merged-on-behalf-of: Martin Nowak <somemail@example.org>");
-            res.statusCode = 200;
         }
     );
 

test/utils.d

@@ -5,7 +5,7 @@ import std.functional, std.string;
 
 // forward commonly needed imports
 public import dlangbot.app;
-public import vibe.http.common : HTTPMethod;
+public import vibe.http.common : HTTPMethod, HTTPStatus;
 public import vibe.http.client : HTTPClientRequest;
 public import vibe.http.server : HTTPServerRequest, HTTPServerResponse;
 public import std.functional : toDelegate;
@@ -104,6 +104,8 @@ auto payloadServer(scope HTTPServerRequest req, scope HTTPServerResponse res)
         assert(0, "Request for unexpected URL received: " ~ req.requestURL);
     }
 
+    res.statusCode = expectation.respStatusCode;
+
     string filePath = buildPath(payloadDir, req.requestURL[1 .. $].replace("/", "_"));
 
     if (expectation.reqHandler !is null)
@@ -169,14 +171,18 @@ void replaceAPIReferences(string official, string local, ref Json json)
 
 struct APIExpectation
 {
+    /// the called server url
     string url;
 
-    // implement a custom request handler
+    /// implement a custom request handler
     private void delegate(scope HTTPServerRequest req, scope HTTPServerResponse res) reqHandler;
 
-    // modify the json of the payload before being served
+    /// modify the json of the payload before being served
     private void delegate(ref Json j) jsonHandler;
 
+    /// respond with the given status
+    HTTPStatus respStatusCode = HTTPStatus.ok;
+
     this(string url)
     {
         this.url = url;
@@ -195,7 +201,11 @@ void setAPIExpectations(Args...)(Args args)
     {
         static if (is(Args[i] : string))
         {
-                apiExpectations ~= APIExpectation(arg);
+            apiExpectations ~= APIExpectation(arg);
+        }
+        else static if (is(Args[i] : HTTPStatus))
+        {
+            apiExpectations[$ - 1].respStatusCode = arg;
         }
         else
         {