add test for async rq mode

tests_configs.ini

@@ -28,4 +28,30 @@ email.notification.processing_mode = sync
 email.notification.smtp.server = 127.0.0.1
 email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
+email.notification.smtp.password = just_a_password
+
+[mail_test_async]
+sqlalchemy.url = sqlite:///:memory:
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+email.notification.activated = true
+email.notification.from.email = test_user_from+{user_id}@localhost
+email.notification.from.default_label = Tracim Notifications
+email.notification.reply_to.email = test_user_reply+{content_id}@localhost
+email.notification.references.email = test_user_refs+{content_id}@localhost
+email.notification.content_update.template.html = %(here)s/tracim/templates/mail/content_update_body_html.mak
+email.notification.content_update.template.text = %(here)s/tracim/templates/mail/content_update_body_text.mak
+email.notification.created_account.template.html = %(here)s/tracim/templates/mail/created_account_body_html.mak
+email.notification.created_account.template.text = %(here)s/tracim/templates/mail/created_account_body_text.mak
+# Note: items between { and } are variable names. Do not remove / rename them
+email.notification.content_update.subject = [{website_title}] [{workspace_label}] {content_label} ({content_status_label})
+email.notification.created_account.subject = [{website_title}] Created account
+# processing_mode may be sync or async
+email.notification.processing_mode = sync
+email.processing_mode = async
+email.notification.smtp.server = 127.0.0.1
+email.notification.smtp.port = 1025
+email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password

tracim/tests/functional/test_mail_notification.py

@@ -5,21 +5,19 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 
 import requests
-import transaction
+from rq import SimpleWorker
 
 from tracim.fixtures.users_and_groups import Base as BaseFixture
 from tracim.fixtures.content import Content as ContentFixture
+from tracim.lib.utils.utils import get_redis_connection
+from tracim.lib.utils.utils import get_rq_queue
 from tracim.models.data import ContentType
 
 from tracim.lib.core.content import ContentApi
-from tracim.lib.core.group import GroupApi
 from tracim.lib.core.user import UserApi
-from tracim.lib.core.userworkspace import RoleApi
 from tracim.lib.core.workspace import WorkspaceApi
-from tracim.lib.mail_notifier.notifier import EmailManager
 from tracim.lib.mail_notifier.sender import EmailSender
 from tracim.lib.mail_notifier.utils import SmtpConfiguration
-from tracim.models import Group
 from tracim.tests import MailHogTest
 
 
@@ -81,12 +79,14 @@ class TestEmailSender(MailHogTest):
         headers = response[0]['Content']['Headers']
         assert headers['From'][0] == 'test_send_mail@localhost'
         assert headers['To'][0] == 'receiver_test_send_mail@localhost'
-        assert headers['Subject'][0] == 'test__func__send_email__ok__nominal_case'
+        assert headers['Subject'][0] == 'test__func__send_email__ok__nominal_case'  # nopep8
         assert response[0]['MIME']['Parts'][0]['Body'] == text
         assert response[0]['MIME']['Parts'][1]['Body'] == html
 
 
-class testUserNotification(MailHogTest):
+class TestNotificationsSync(MailHogTest):
+
+    fixtures = [BaseFixture, ContentFixture]
 
     def test_func__create_user_with_mail_notification__ok__nominal_case(self):
         api = UserApi(
@@ -112,14 +112,100 @@ class testUserNotification(MailHogTest):
         response = requests.get('http://127.0.0.1:8025/api/v1/messages')
         response = response.json()
         headers = response[0]['Content']['Headers']
-        assert headers['From'][0] == 'Tracim Notifications <test_user_from+0@localhost>'
+        assert headers['From'][0] == 'Tracim Notifications <test_user_from+0@localhost>'  # nopep8
         assert headers['To'][0] == 'bob <bob@bob>'
         assert headers['Subject'][0] == '[TRACIM] Created account'
 
+    def test_func__create_new_content_with_notification__ok__nominal_case(self):
+        uapi = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        current_user = uapi.get_one_by_email('admin@admin.admin')
+        # Create new user with notification enabled on w1 workspace
+        wapi = WorkspaceApi(
+            current_user=current_user,
+            session=self.session,
+        )
+        workspace = wapi.get_one_by_label('w1')
+        user = uapi.get_one_by_email('bob@fsf.local')
+        wapi.enable_notifications(user, workspace)
 
-class testContentNotification(MailHogTest):
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        )
+        item = api.create(
+            ContentType.Folder,
+            workspace,
+            None,
+            'parent',
+            do_save=True,
+            do_notify=False,
+        )
+        item2 = api.create(
+            ContentType.File,
+            workspace,
+            item,
+            'file1',
+            do_save=True,
+            do_notify=True,
+        )
 
+        # check mail received
+        response = requests.get('http://127.0.0.1:8025/api/v1/messages')
+        response = response.json()
+        headers = response[0]['Content']['Headers']
+        assert headers['From'][0] == '"Bob i. via Tracim" <test_user_from+3@localhost>'  # nopep8
+        assert headers['To'][0] == 'Global manager <admin@admin.admin>'
+        assert headers['Subject'][0] == '[TRACIM] [w1] file1 (open)'
+        assert headers['References'][0] == 'test_user_refs+13@localhost'
+        assert headers['Reply-to'][0] == '"Bob i. & all members of w1" <test_user_reply+13@localhost>'  # nopep8
+
+
+class TestNotificationsAsync(MailHogTest):
     fixtures = [BaseFixture, ContentFixture]
+    config_section = 'mail_test_async'
+
+    def test_func__create_user_with_mail_notification__ok__nominal_case(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        u = api.create_user(
+            email='bob@bob',
+            password='pass',
+            name='bob',
+            timezone='+2',
+            do_save=True,
+            do_notify=True,
+        )
+        assert u is not None
+        assert u.email == "bob@bob"
+        assert u.validate_password('pass')
+        assert u.display_name == 'bob'
+        assert u.timezone == '+2'
+
+        # Send mail async from redis queue
+        redis = get_redis_connection(
+            self.app_config
+        )
+        queue = get_rq_queue(
+            redis,
+            'mail_sender',
+        )
+        worker = SimpleWorker([queue], connection=queue.connection)
+        worker.work(burst=True)
+        # check mail received
+        response = requests.get('http://127.0.0.1:8025/api/v1/messages')
+        response = response.json()
+        headers = response[0]['Content']['Headers']
+        assert headers['From'][0] == 'Tracim Notifications <test_user_from+0@localhost>'  # nopep8
+        assert headers['To'][0] == 'bob <bob@bob>'
+        assert headers['Subject'][0] == '[TRACIM] Created account'
 
     def test_func__create_new_content_with_notification__ok__nominal_case(self):
         uapi = UserApi(
@@ -158,13 +244,22 @@ class testContentNotification(MailHogTest):
             do_save=True,
             do_notify=True,
         )
-
+        # Send mail async from redis queue
+        redis = get_redis_connection(
+            self.app_config
+        )
+        queue = get_rq_queue(
+            redis,
+            'mail_sender',
+        )
+        worker = SimpleWorker([queue], connection=queue.connection)
+        worker.work(burst=True)
         # check mail received
         response = requests.get('http://127.0.0.1:8025/api/v1/messages')
         response = response.json()
         headers = response[0]['Content']['Headers']
-        assert headers['From'][0] == '"Bob i. via Tracim" <test_user_from+3@localhost>'
+        assert headers['From'][0] == '"Bob i. via Tracim" <test_user_from+3@localhost>'  # nopep8
         assert headers['To'][0] == 'Global manager <admin@admin.admin>'
         assert headers['Subject'][0] == '[TRACIM] [w1] file1 (open)'
         assert headers['References'][0] == 'test_user_refs+13@localhost'
-        assert headers['Reply-to'][0] == '"Bob i. & all members of w1" <test_user_reply+13@localhost>'
+        assert headers['Reply-to'][0] == '"Bob i. & all members of w1" <test_user_reply+13@localhost>'  # nopep8