Merge pull request #157 from wilzbach/sicmp-check-remove

Use sicmp for checkAndRemoveLabels
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>

Author: dlang-bot

source/dlangbot/github.d

@@ -197,10 +197,10 @@ Json[] tryMerge(in ref PullRequest pr, GHMerge.MergeMethod method)
 
 void checkAndRemoveLabels(GHLabel[] labels, in ref PullRequest pr, in string[] toRemoveLabels)
 {
-    import std.uni : toLower;
+    import std.uni : sicmp;
     labels
-        .map!(l => l.name.toLower)
-        .filter!(n => toRemoveLabels.canFind(n))
+        .map!(l => l.name)
+        .filter!(n => toRemoveLabels.canFind!((a, b) => sicmp(a,b) == 0)(n))
         .each!(l => pr.removeLabel(l));
 }
 
@@ -222,7 +222,8 @@ void addLabels(in ref PullRequest pr, in string[] newLabels)
 
 void removeLabel(in ref PullRequest pr, string label)
 {
-    ghSendRequest(HTTPMethod.DELETE, pr.labelsURL ~ "/" ~ label);
+    import std.uri : encodeComponent;
+    ghSendRequest(HTTPMethod.DELETE, pr.labelsURL ~ "/" ~ label.encodeComponent);
 }
 
 void replaceLabels(in ref PullRequest pr, string[] labels)

test/comments.d

@@ -410,3 +410,36 @@ unittest
 
     postGitHubHook("dlang_phobos_synchronize_4921.json");
 }
+
+// Remove old labels on push
+unittest
+{
+    import std.array : replace;
+    foreach (label; ["needs work", "Needs work", "stalled"])
+    {
+        setAPIExpectations(
+            "/github/repos/dlang/phobos/pulls/4921/commits", (ref Json j) {
+                j = Json.emptyArray;
+             },
+            "/github/repos/dlang/phobos/issues/4921/labels", (ref Json j) {
+                j[0]["name"] = label;
+            },
+            // encodeComponent is avoided on purpose
+            "/github/repos/dlang/phobos/issues/4921/labels/" ~ label.replace(" ", "%20"),
+            (scope HTTPServerRequest req, scope HTTPServerResponse res){
+                assert(req.method == HTTPMethod.DELETE);
+            },
+             "/github/repos/dlang/phobos/issues/4921/comments",
+            "/github/orgs/dlang/public_members?per_page=100",
+             "/github/repos/dlang/phobos/issues/comments/262784442",
+            (scope HTTPServerRequest req, scope HTTPServerResponse res){
+                assert(req.method == HTTPMethod.PATCH);
+                auto body_ = req.json["body"].get!string;
+                assert(body_.canFind("@andralex"));
+                assert(!body_.canFind("Auto-close | Bugzilla"), "Shouldn't contain bug header");
+                assert(!body_.canFind("/show_bug.cgi?id="), "Shouldn't contain a Bugzilla reference");
+            }
+        );
+        postGitHubHook("dlang_phobos_synchronize_4921.json");
+    }
+}