squash 169

department-of-veterans-affairs · Dec 12, 2024 · bd3a76f · bd3a76f
1 parent 740fdce
commit bd3a76f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/notifications_utils/action_link.py b/notifications_utils/action_link.py
@@ -11,6 +11,10 @@
 from mistune.util import escape_url
 
 
+# TODO - See these examples of how mistune matches link and block_quote:
+#   https://github.com/lepture/mistune/blob/master/src/mistune/inline_parser.py#L75
+#   https://github.com/lepture/mistune/blob/master/src/mistune/block_parser.py#L73
+# How I use "before" matters.  I'm not certain if this should be inline, block, or both.
 ACTION_LINK_PATTERN = r'''>>\[(?P<text>[\w ]+)\]\((?P<url>\S+)\)'''
 # ACTION_LINK_PATTERN = r'''\[action'''
 

diff --git a/tests/test_template_types.py b/tests/test_template_types.py
@@ -182,50 +182,51 @@ def test_get_html_email_body_with_action_links(content, values, expected):
             'normal placeholder formatting: ((foo))',
             (
                 f'<p style="{PARAGRAPH_STYLE}">normal placeholder formatting: <span class=\'placeholder\'><mark>((foo))'
-                '</mark></span></p>'
+                '</mark></span></p>\n'
             ),
         ),
         (
             'regular markdown link: [link text](#)',
             (
                 f'<p style="{PARAGRAPH_STYLE}">regular markdown link: '
-                f'<a style="{LINK_STYLE}" href="#" target="_blank">link text</a></p>'
+                f'<a style="{LINK_STYLE}" target="_blank" href="#">link text</a></p>\n'
             ),
         ),
         (
             'placeholder in link text, without placeholder in link: [link ((foo))](https://test.com/)',
             (
                 f'<p style="{PARAGRAPH_STYLE}">placeholder in link text, without placeholder in link: '
-                f'<a style="{LINK_STYLE}" href="https://test.com/" target="_blank">link '
-                '<span class=\'placeholder\'><mark>((foo))</mark></span></a></p>'
+                f'<a style="{LINK_STYLE}" target="_blank" href="https://test.com/">link '
+                '<span class=\'placeholder\'><mark>((foo))</mark></span></a></p>\n'
             ),
         ),
         (
             'no format within link, placeholder at end: [link text](https://test.com/((foo)))',
             (
                 f'<p style="{PARAGRAPH_STYLE}">no format within link, placeholder at end: '
-                f'<a style="{LINK_STYLE}" href="https://test.com/((foo))" target="_blank">link text</a></p>'
+                f'<a style="{LINK_STYLE}" target="_blank" href="https://test.com/((foo))">link text</a></p>\n'
             )
         ),
         (
             'no format within link, placeholder in middle: [link text](https://test.com/((foo))?xyz=123)',
             (
                 f'<p style="{PARAGRAPH_STYLE}">no format within link, placeholder in middle: '
-                f'<a style="{LINK_STYLE}" href="https://test.com/((foo))?xyz=123" target="_blank">link text</a></p>'
+                f'<a style="{LINK_STYLE}" target="_blank" href="https://test.com/((foo))?xyz=123">link text</a></p>\n'
             )
         ),
         (
             'no format in link, with only placeholder: [link text](((foo)))',
             (
                 f'<p style="{PARAGRAPH_STYLE}">no format in link, with only placeholder: '
-                f'<a style="{LINK_STYLE}" href="((foo))" target="_blank">link text</a></p>'
+                f'<a style="{LINK_STYLE}" target="_blank" href="((foo))">link text</a></p>\n'
             )
         ),
         (
             'no format within link, multiple placeholders: [link text](https://test.com/((foo))?xyz=((bar)))',
             (
                 f'<p style="{PARAGRAPH_STYLE}">no format within link, multiple placeholders: '
-                f'<a style="{LINK_STYLE}" href="https://test.com/((foo))?xyz=((bar))" target="_blank">link text</a></p>'
+                f'<a style="{LINK_STYLE}" target="_blank" href="https://test.com/((foo))?xyz=((bar))">'
+                'link text</a></p>\n'
             )
         ),
     ],