Merge pull request #1849 from intuit/slack-validation-bug

handle capital X in semver bump list
intuit · Mar 3, 2021 · ba1865e · ba1865e
2 parents 47462c0 + 1bb0ba8
commit ba1865e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/plugins/pr-body-labels/__tests__/pr-body-labels.test.ts b/plugins/pr-body-labels/__tests__/pr-body-labels.test.ts
@@ -37,6 +37,23 @@ describe("Pr-Body-Labels Plugin", () => {
     expect(addLabelToPr).toHaveBeenCalledWith(1, "patch");
   });
 
+  test("add labels present in project capital X", async () => {
+    const plugin = new PrBodyLabels();
+    const hooks = makeHooks();
+    const addLabelToPr = jest.fn();
+
+    plugin.apply({
+      hooks,
+      labels: [{ name: "patch" }],
+      git: { addLabelToPr },
+    } as any);
+
+    await hooks.prCheck.promise({
+      pr: { body: "- [X] `patch`", number: 1 },
+    } as any);
+    expect(addLabelToPr).toHaveBeenCalledWith(1, "patch");
+  });
+
   test("not add labels in disabledLabels list", async () => {
     const plugin = new PrBodyLabels({ disabledLabels: ["patch"] });
     const hooks = makeHooks();

diff --git a/plugins/pr-body-labels/src/index.ts b/plugins/pr-body-labels/src/index.ts
@@ -32,8 +32,12 @@ export default class PrBodyLabelsPlugin implements IPlugin {
 
       await Promise.all(
         auto.labels.map(async (label) => {
+          const hasCheckedLabel =
+            pr.body?.includes(`- [x] \`${label.name}\``) ||
+            pr.body?.includes(`- [X] \`${label.name}\``);
+
           if (
-            pr.body?.includes(`- [x] \`${label.name}\``) &&
+            hasCheckedLabel &&
             !this.options.disabledLabels.includes(label.name)
           ) {
             await auto.git?.addLabelToPr(pr.number, label.name);