API - email service refactoring

fittrackee/tests/emails/test_email_service.py

@@ -1,9 +1,11 @@
 from unittest.mock import Mock, patch
 
+import pytest
 from flask import Flask
 
 from fittrackee import email_service
 from fittrackee.emails.email import EmailMessage
+from fittrackee.emails.exceptions import InvalidEmailUrlScheme
 
 from ..api_test_case import CallArgsMixin
 from .template_results.password_reset_request import expected_en_text_body
@@ -32,7 +34,62 @@ class TestEmailMessage:
         assert 'Hello !' in message_string
 
 
-class TestEmailSending(CallArgsMixin):
+class TestEmailServiceUrlParser(CallArgsMixin):
+    def test_it_raises_error_if_url_scheme_is_invalid(self) -> None:
+        url = 'stmp://username:password@localhost:587'
+        with pytest.raises(InvalidEmailUrlScheme):
+            email_service.parse_email_url(url)
+
+    @staticmethod
+    def assert_parsed_email(url: str) -> None:
+        parsed_email = email_service.parse_email_url(url)
+        assert parsed_email['username'] is None
+        assert parsed_email['password'] is None
+        assert parsed_email['host'] == 'localhost'
+        assert parsed_email['port'] == 25
+        assert parsed_email['use_tls'] is False
+        assert parsed_email['use_ssl'] is False
+
+    def test_it_parses_email_url_without_port(self) -> None:
+        url = 'smtp://localhost'
+        self.assert_parsed_email(url)
+
+    def test_it_parses_email_url_without_authentication(self) -> None:
+        url = 'smtp://localhost:25'
+        self.assert_parsed_email(url)
+
+    def test_it_parses_email_url(self) -> None:
+        url = 'smtp://test@example.com:12345678@localhost:25'
+        parsed_email = email_service.parse_email_url(url)
+        assert parsed_email['username'] == 'test@example.com'
+        assert parsed_email['password'] == '12345678'
+        assert parsed_email['host'] == 'localhost'
+        assert parsed_email['port'] == 25
+        assert parsed_email['use_tls'] is False
+        assert parsed_email['use_ssl'] is False
+
+    def test_it_parses_email_url_with_tls(self) -> None:
+        url = 'smtp://test@example.com:12345678@localhost:587?tls=True'
+        parsed_email = email_service.parse_email_url(url)
+        assert parsed_email['username'] == 'test@example.com'
+        assert parsed_email['password'] == '12345678'
+        assert parsed_email['host'] == 'localhost'
+        assert parsed_email['port'] == 587
+        assert parsed_email['use_tls'] is True
+        assert parsed_email['use_ssl'] is False
+
+    def test_it_parses_email_url_with_ssl(self) -> None:
+        url = 'smtp://test@example.com:12345678@localhost:465?ssl=True'
+        parsed_email = email_service.parse_email_url(url)
+        assert parsed_email['username'] == 'test@example.com'
+        assert parsed_email['password'] == '12345678'
+        assert parsed_email['host'] == 'localhost'
+        assert parsed_email['port'] == 465
+        assert parsed_email['use_tls'] is False
+        assert parsed_email['use_ssl'] is True
+
+
+class TestEmailServiceSend(CallArgsMixin):
 
     email_data = {
         'expiration_delay': '3 seconds',

fittrackee/tests/emails/test_email_utils.py

@@ -1,61 +0,0 @@
-import pytest
-
-from fittrackee.emails.utils_email import (
-    InvalidEmailUrlScheme,
-    parse_email_url,
-)
-
-
-class TestEmailUrlParser:
-    def test_it_raises_error_if_url_scheme_is_invalid(self) -> None:
-        url = 'stmp://username:password@localhost:587'
-        with pytest.raises(InvalidEmailUrlScheme):
-            parse_email_url(url)
-
-    @staticmethod
-    def assert_parsed_email(url: str) -> None:
-        parsed_email = parse_email_url(url)
-        assert parsed_email['username'] is None
-        assert parsed_email['password'] is None
-        assert parsed_email['host'] == 'localhost'
-        assert parsed_email['port'] == 25
-        assert parsed_email['use_tls'] is False
-        assert parsed_email['use_ssl'] is False
-
-    def test_it_parses_email_url_without_port(self) -> None:
-        url = 'smtp://localhost'
-        self.assert_parsed_email(url)
-
-    def test_it_parses_email_url_without_authentication(self) -> None:
-        url = 'smtp://localhost:25'
-        self.assert_parsed_email(url)
-
-    def test_it_parses_email_url(self) -> None:
-        url = 'smtp://test@example.com:12345678@localhost:25'
-        parsed_email = parse_email_url(url)
-        assert parsed_email['username'] == 'test@example.com'
-        assert parsed_email['password'] == '12345678'
-        assert parsed_email['host'] == 'localhost'
-        assert parsed_email['port'] == 25
-        assert parsed_email['use_tls'] is False
-        assert parsed_email['use_ssl'] is False
-
-    def test_it_parses_email_url_with_tls(self) -> None:
-        url = 'smtp://test@example.com:12345678@localhost:587?tls=True'
-        parsed_email = parse_email_url(url)
-        assert parsed_email['username'] == 'test@example.com'
-        assert parsed_email['password'] == '12345678'
-        assert parsed_email['host'] == 'localhost'
-        assert parsed_email['port'] == 587
-        assert parsed_email['use_tls'] is True
-        assert parsed_email['use_ssl'] is False
-
-    def test_it_parses_email_url_with_ssl(self) -> None:
-        url = 'smtp://test@example.com:12345678@localhost:465?ssl=True'
-        parsed_email = parse_email_url(url)
-        assert parsed_email['username'] == 'test@example.com'
-        assert parsed_email['password'] == '12345678'
-        assert parsed_email['host'] == 'localhost'
-        assert parsed_email['port'] == 465
-        assert parsed_email['use_tls'] is False
-        assert parsed_email['use_ssl'] is True