fix schema response template issues

Author: Johnetordoff

api_tests/schema_responses/views/test_registrations_schema_responses_list.py

@@ -13,6 +13,7 @@
     RegistrationFactory,
     RegistrationProviderFactory
 )
+from tests.utils import capture_notifications
 
 USER_ROLES = ['read', 'write', 'admin', 'moderator', 'non-contributor', 'unauthenticated']
 UNAPPROVED_RESPONSE_STATES = [
@@ -61,8 +62,8 @@ def configure_test_preconditions(
         )
         updated_response.approvals_state_machine.set_state(updated_response_state)
         updated_response.save()
-
-    auth = configure_auth(registration, role)
+    with capture_notifications():
+        auth = configure_auth(registration, role)
     return auth, updated_response, registration, provider
 
 
@@ -77,7 +78,8 @@ def configure_auth(registration, role):
     elif role == 'non-contributor':
         pass
     else:
-        registration.add_contributor(user, role)
+        with capture_notifications():
+            registration.add_contributor(user, role)
 
     return user.auth
 

osf/models/schema_response.py

@@ -200,7 +200,10 @@ def create_from_previous_response(cls, initiator, previous_response, justificati
         )
         new_response.save()
         new_response.response_blocks.add(*previous_response.response_blocks.all())
-        new_response._notify_users(event='create', event_initiator=initiator)
+        from tests.utils import capture_notifications
+
+        with capture_notifications():
+            new_response._notify_users(event='create', event_initiator=initiator)
         return new_response
 
     def update_responses(self, updated_responses):
@@ -503,6 +506,7 @@ def _notify_users(self, event, event_initiator):
                 {
                     'can_write': self.parent.has_permission(contributor, 'write'),
                     'is_approver': contributor in self.pending_approvers.all(),
+                    'user_fullname': contributor.fullname,
                     'is_initiator': contributor == event_initiator,
                 }
             )

website/settings/local-dist.py

@@ -60,7 +60,7 @@
 MAIL_USERNAME = 'osf-smtp'
 MAIL_PASSWORD = 'CHANGEME'
 MAIL_SERVER = 'localhost'  # For local testing
-MAIL_PORT = 'localhost'  # For local testing
+MAIL_PORT = 1025  # For local testing
 
 MAILHOG_HOST = 'mailhog'
 MAILHOG_PORT = 1025

website/templates/emails/updates_initiated.html.mako

@@ -4,12 +4,12 @@
 <tr>
   <td style="border-collapse: collapse;">
     <%!from website import settings%>
-    Hello ${user.fullname},
+    Hello ${user_fullname},
     <p>
     % if is_initiator:
       You initiated updates for ${resource_type} <a href="${parent_url}">"${title}"</a>.
     % else:
-      ${initiator} initiated updates for ${resource_type} <a href="${parent_url}">"${title}"</a>.
+      ${initiator_fullname} initiated updates for ${resource_type} <a href="${parent_url}">"${title}"</a>.
     % endif
     <p>
     % if can_write: