fixed linter issues and tests

Author: sabuhish

.github/workflows/linter.yaml

@@ -1,10 +1,5 @@
-name: CI
-
-on: 
-  push:
-    branches: '**'
-  pull_request:
-    branches: '**'
+name: CI Linter
+on: [push, pull_request]
 
 jobs:
   ci:

.github/workflows/test-package.yml

@@ -1,7 +1,5 @@
-name: CI
-on: 
-  push:
-    branches: '**'
+name: CI Tests
+on: [push, pull_request]
 
 jobs:
   ci:

fastapi_mail/msg.py

@@ -7,6 +7,7 @@
 from email.mime.text import MIMEText
 from email.utils import formatdate, make_msgid
 from typing import Any, Union
+
 from .schemas import MessageType, MultipartSubtypeEnum
 
 PY3 = sys.version_info[0] == 3

fastapi_mail/schemas.py

@@ -4,7 +4,7 @@
 from mimetypes import MimeTypes
 from typing import Dict, List, Optional, Union
 
-from pydantic import BaseModel, EmailStr, validator, root_validator
+from pydantic import BaseModel, EmailStr, root_validator, validator
 from starlette.datastructures import Headers, UploadFile
 
 from fastapi_mail.errors import WrongFile
@@ -72,7 +72,9 @@ def validate_file(cls, v):
                         if content_type:
                             headers = Headers({"content-type": content_type})
                         file_content = BytesIO(f.read())
-                        u = UploadFile(filename=file_name, file=file_content, headers=headers)
+                        u = UploadFile(
+                            filename=file_name, file=file_content, headers=headers
+                        )
                         temp.append((u, file_meta))
                 else:
                     raise WrongFile(

tests/test_connection.py

@@ -87,7 +87,10 @@ async def test_attachement_message(mail_config):
 
         assert len(outbox) == 1
         assert mail._payload[1].get_content_maintype() == "application"
-        assert mail._payload[1].__dict__.get("_headers")[0][1] == "application/octet-stream"
+        assert (
+            mail._payload[1].__dict__.get("_headers")[0][1]
+            == "application/octet-stream"
+        )
 
 
 @pytest.mark.asyncio
@@ -149,16 +152,20 @@ async def test_attachement_message_with_headers(mail_config):
 
         assert len(outbox) == 1
         mail = outbox[0]
-        assert mail._payload[1].get_content_maintype() == msg.attachments[0][1].get("mime_type")
-        assert mail._payload[1].get_content_subtype() == msg.attachments[0][1].get("mime_subtype")
+        assert mail._payload[1].get_content_maintype() == msg.attachments[0][1].get(
+            "mime_type"
+        )
+        assert mail._payload[1].get_content_subtype() == msg.attachments[0][1].get(
+            "mime_subtype"
+        )
 
         assert mail._payload[1].__dict__.get("_headers")[0][1] == "image/png"
-        assert mail._payload[1].__dict__.get("_headers")[3][1] == msg.attachments[0][1].get(
-            "headers"
-        ).get("Content-ID")
-        assert mail._payload[1].__dict__.get("_headers")[4][1] == msg.attachments[0][1].get(
-            "headers"
-        ).get("Content-Disposition")
+        assert mail._payload[1].__dict__.get("_headers")[3][1] == msg.attachments[0][
+            1
+        ].get("headers").get("Content-ID")
+        assert mail._payload[1].__dict__.get("_headers")[4][1] == msg.attachments[0][
+            1
+        ].get("headers").get("Content-Disposition")
 
         assert (
             mail._payload[2].__dict__.get("_headers")[3][1] == "attachment; "
@@ -182,7 +189,9 @@ async def test_jinja_message_list(mail_config):
     fm = FastMail(conf)
 
     with fm.record_messages() as outbox:
-        await fm.send_message(message=msg, template_name="array_iteration_jinja_template.html")
+        await fm.send_message(
+            message=msg, template_name="array_iteration_jinja_template.html"
+        )
 
         assert len(outbox) == 1
         mail = outbox[0]
@@ -248,7 +257,7 @@ async def test_send_msg_with_subtype(mail_config):
     msg = MessageSchema(
         subject="testing",
         recipients=["[email protected]"],
-        body="<p Test data </p>",
+        body="<p> Test data </p>",
         subtype=MessageType.html,
     )
 
@@ -263,7 +272,7 @@ async def test_send_msg_with_subtype(mail_config):
         assert outbox[0]["subject"] == "testing"
         assert outbox[0]["from"] == sender
         assert outbox[0]["To"] == "[email protected]"
-    assert msg.body == "<p Test data </p>"
+    assert msg.body == "<p> Test data </p>"
     assert msg.subtype == MessageType.html
 
 
@@ -281,7 +290,9 @@ async def test_jinja_message_with_html(mail_config):
     )
     conf = ConnectionConfig(**mail_config)
     fm = FastMail(conf)
-    await fm.send_message(message=msg, template_name="array_iteration_jinja_template.html")
+    await fm.send_message(
+        message=msg, template_name="array_iteration_jinja_template.html"
+    )
 
     assert msg.template_body == ("\n    \n    \n        Andrej\n    \n\n")
 
@@ -293,7 +304,7 @@ async def test_send_msg_with_alternative_body(mail_config):
     msg = MessageSchema(
         subject="testing",
         recipients=["[email protected]"],
-        body="<p Test data </p>",
+        body="<p> Test data </p>",
         subtype=MessageType.html,
         alternative_body="Test data",
         multipart_subtype=MultipartSubtypeEnum.alternative,
@@ -361,4 +372,7 @@ async def test_send_msg_with_alternative_body_and_attachements(mail_config):
         assert body._payload[1]._headers[0][1] == 'text/plain; charset="utf-8"'
 
         assert mail._payload[1].get_content_maintype() == "application"
-        assert mail._payload[1].__dict__.get("_headers")[0][1] == "application/octet-stream"
+        assert (
+            mail._payload[1].__dict__.get("_headers")[0][1]
+            == "application/octet-stream"
+        )

tests/test_message.py

@@ -4,7 +4,6 @@
 
 from fastapi_mail.msg import MailMsg
 from fastapi_mail.schemas import MessageSchema, MessageType, MultipartSubtypeEnum
-from pydantic.error_wrappers import ValidationError
 
 
 def test_initialize():
@@ -199,7 +198,7 @@ def test_message_with_alternative_body_but_wrong_multipart_subtype():
         subtype=MessageType.plain,
         alternative_body="alternative",
     )
-    assert message.alternative_body == None
+    assert message.alternative_body is None
 
 
 def test_message_with_alternative_body():