added test cases to see if non-ascii process is triggered

Author: berelian1

tests/test_main.py

@@ -765,22 +765,19 @@ def test_other_mime_type(tmpdir):
         email
         [email protected]
     """), encoding="utf8")
-
     # Simple unsecure server config
     config_path = Path(tmpdir/"mailmerge_server.conf")
     config_path.write_text(textwrap.dedent("""\
         [smtp_server]
         host = open-smtp.example.com
         port = 25
     """), encoding="utf8")
-
     # Run mailmerge
     runner = click.testing.CliRunner()
     with tmpdir.as_cwd():
         result = runner.invoke(main, [])
     assert not result.exception
     assert result.exit_code == 0
-
     # Verify output
     stdout = copy.deepcopy(result.output)
     stdout = re.sub(r"Date:.+", "Date: REDACTED", stdout, re.MULTILINE)
@@ -820,27 +817,23 @@ def test_database_bom(tmpdir):
 
         Hello {{name}}
     """), encoding="utf8")
-
     # Copy database containing a BOM
     database_path = Path(tmpdir/"mailmerge_database.csv")
     database_with_bom = utils.TESTDATA/"mailmerge_database_with_BOM.csv"
     shutil.copyfile(database_with_bom, database_path)
-
     # Simple unsecure server config
     config_path = Path(tmpdir/"mailmerge_server.conf")
     config_path.write_text(textwrap.dedent("""\
         [smtp_server]
         host = open-smtp.example.com
         port = 25
     """), encoding="utf8")
-
     # Run mailmerge
     runner = click.testing.CliRunner()
     with tmpdir.as_cwd():
         result = runner.invoke(main, ["--output-format", "text"])
     assert not result.exception
     assert result.exit_code == 0
-
     # Verify output
     stdout = copy.deepcopy(result.output)
     stdout = re.sub(r"Date:.+", "Date: REDACTED", stdout, re.MULTILINE)
@@ -871,29 +864,25 @@ def test_database_tsv(tmpdir):
 
         Hello {{name}}
     """), encoding="utf8")
-
     # Tab-separated format database
     database_path = Path(tmpdir/"mailmerge_database.csv")
     database_path.write_text(textwrap.dedent("""\
         email\tname
         [email protected]\tMy Name
     """), encoding="utf8")
-
     # Simple unsecure server config
     config_path = Path(tmpdir/"mailmerge_server.conf")
     config_path.write_text(textwrap.dedent("""\
         [smtp_server]
         host = open-smtp.example.com
         port = 25
     """), encoding="utf8")
-
     # Run mailmerge
     runner = click.testing.CliRunner()
     with tmpdir.as_cwd():
         result = runner.invoke(main, ["--output-format", "text"])
     assert not result.exception
     assert result.exit_code == 0
-
     # Verify output
     stdout = copy.deepcopy(result.output)
     stdout = re.sub(r"Date:.+", "Date: REDACTED", stdout, re.MULTILINE)
@@ -924,29 +913,25 @@ def test_database_semicolon(tmpdir):
 
         Hello {{name}}
     """), encoding="utf8")
-
     # Semicolon-separated format database
     database_path = Path(tmpdir/"mailmerge_database.csv")
     database_path.write_text(textwrap.dedent("""\
         email;name
         [email protected];My Name
     """), encoding="utf8")
-
     # Simple unsecure server config
     config_path = Path(tmpdir/"mailmerge_server.conf")
     config_path.write_text(textwrap.dedent("""\
         [smtp_server]
         host = open-smtp.example.com
         port = 25
     """), encoding="utf8")
-
     # Run mailmerge
     runner = click.testing.CliRunner()
     with tmpdir.as_cwd():
         result = runner.invoke(main, ["--output-format", "text"])
     assert not result.exception
     assert result.exit_code == 0
-
     # Verify output
     stdout = copy.deepcopy(result.output)
     stdout = re.sub(r"Date:.+", "Date: REDACTED", stdout, re.MULTILINE)
@@ -965,3 +950,50 @@ def test_database_semicolon(tmpdir):
         >>> Limit was 1 message.  To remove the limit, use the --no-limit option.
         >>> This was a dry run.  To send messages, use the --no-dry-run option.
     """)  # noqa: E501
+
+
+def test_utf8smtp_trigger(tmpdir):
+    """Verify triggers to rcpt_options=['UTF8SMTP']."""
+    template_path = Path(tmpdir/"mailmerge_template.txt")
+    template_path.write_text(textwrap.dedent("""\
+        TO: mü[email protected]
+        FROM: [email protected]
+        SUBJECT: UTF8SMTP Test
+        Hello{{name}}!
+    """), encoding="utf8")
+    database_path = Path(tmpdir/"mailmerge_database.csv")
+    database_path.write_text(textwrap.dedent("""\
+        email;name
+        mü[email protected]; Max Müller
+    """), encoding="utf8")
+    config_path = Path(tmpdir/"mailmerge_server.conf")
+    config_path.write_text(textwrap.dedent("""\
+        [smtp_server]
+        host = open-smtp.example.com
+        port = 25
+    """), encoding="utf8")
+    runner = click.testing.CliRunner()
+    with tmpdir.as_cwd():
+        result = runner.invoke(main, [
+            "--dry-run",
+            "--no-limit",
+            "--output-format", "text",
+        ])
+    assert result.exit_code == 0
+    assert not result.exception
+    stdout = result.output
+    stdout = re.sub(r"Date:.+", "Date: REDACTED", stdout, re.MULTILINE)
+    assert stdout == textwrap.dedent("""\
+        >>> message 1
+        TO: mü[email protected]
+        FROM: [email protected]
+        SUBJECT: UTF8SMTP Test
+        MIME-Version: 1.0
+        Content-Type: text/plain; charset="utf-8"
+        Content-Transfer-Encoding: base64
+        Date: REDACTED                        
+        Hello Max Müller!
+                                     
+        >>> message 1 sent
+        >>> This was a dry run.  To send messages, use the --no-dry-run option.
+    """)  # noqa: E501

tests/test_sendmail_client.py

@@ -609,3 +609,47 @@ def test_socket_error(mocker, tmp_path):
 
     # Verify exception string
     assert "Dummy error message" in str(err.value)
+
+
+def test_utf8smtp_trigger(mocker, tmp_path):
+    """Verify UTF8SMTP trigger."""
+    # Config for SSL SMTP server
+    config_path = tmp_path / "server.conf"
+    config_path.write_text(textwrap.dedent("""\
+        [smtp_server]
+        host = smtp.gmail.com
+        port = 465
+        security = SSL/TLS
+        username = awdeorio
+    """))
+
+    sendmail_client = SendmailClient(config_path, dry_run=False)
+
+    message = email.message_from_string(textwrap.dedent("""\
+        TO: mü[email protected]
+        SUBJECT: UTF8 Test
+        FROM: [email protected]
+
+        Hello!
+    """))
+
+    # Patch SMTP_SSL and getpass
+    mock_smtp_ssl = mocker.patch('smtplib.SMTP_SSL')
+    mock_getpass = mocker.patch('getpass.getpass')
+    mock_getpass.return_value = "password"
+
+    # Send the message
+    sendmail_client.sendmail(
+        sender="[email protected]",
+        recipients=["mü[email protected]"],
+        message=message,
+    )
+
+    # Grab mocked SMTP instance
+    smtp = mock_smtp_ssl.return_value.__enter__.return_value
+
+    # Assert UTF8SMTP was passed
+    smtp.sendmail.assert_called_once()
+    kwargs = smtp.sendmail.call_args.kwargs
+    assert "rcpt_options" in kwargs
+    assert kwargs["rcpt_options"] == "UTF8SMTP"