Fix #552: do not match tags if not surrounded by dashes (#555)

Author: leplatrem

jbi/models.py

@@ -272,7 +272,8 @@ def lookup_action(self, actions: Actions) -> Action:
         """Find first matching action from bug's whiteboard list"""
         if self.whiteboard:
             for tag, action in actions.by_tag.items():
-                search_string = r"\[[^\]]*" + tag + r"[^\]]*\]"
+                # [tag-word], [word-tag], [tag-], [tag], but not [wordtag]
+                search_string = r"\[([^\]]*-)*" + tag + r"(-[^\]]*)*\]"
                 if re.search(search_string, self.whiteboard, flags=re.IGNORECASE):
                     return action
 

tests/unit/test_bugzilla.py

@@ -31,10 +31,16 @@ def test_extract_see_also(see_also, expected):
 @pytest.mark.parametrize(
     "whiteboard",
     [
+        "[DevTest-]",
+        "[-DevTest-]",
+        "[-DevTest]",
+        "[DevTest-test]",
+        "[test-DevTest]",
+        "[foo-DevTest-bar]",
+        "[foo-bar-DevTest-foo-bar]",
         "[example][DevTest]",
-        "[example][DevTest-test]",
-        "[example][test-DevTest]",
-        "[example][foo-DevTest-bar]",
+        "[DevTest][example]",
+        "[example][DevTest][example]",
     ],
 )
 def test_lookup_action_found(whiteboard, actions_example):
@@ -48,6 +54,11 @@ def test_lookup_action_found(whiteboard, actions_example):
     "whiteboard",
     [
         "example DevTest",
+        "[fooDevTest]",
+        "[DevTestbar]",
+        "[fooDevTestbar]",
+        "[fooDevTest-bar]",
+        "[foo-DevTestbar]",
         "[foo] devtest [bar]",
     ],
 )