fix more test stuff

Author: John Tordoff

api_tests/preprints/views/test_preprint_contributors_list.py

@@ -1502,22 +1502,21 @@ def test_publishing_preprint_sends_emails_to_contributors(
         url = f'/{API_BASE}preprints/{preprint_unpublished._id}/'
         user_two = AuthUserFactory()
         preprint_unpublished.add_contributor(user_two, permissions=permissions.WRITE, save=True)
-        with capture_notifications():
-            with capture_signals() as mock_signal:
-                with assert_notification(type=NotificationType.Type.PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION, user=user):
-                    res = app.patch_json_api(
-                        url,
-                        {
-                            'data': {
-                                'id': preprint_unpublished._id,
-                                'type': 'preprints',
-                                'attributes': {
-                                    'is_published': True
-                                }
+        with capture_signals() as mock_signal:
+            with assert_notification(type=NotificationType.Type.PROVIDER_REVIEWS_SUBMISSION_CONFIRMATION, user=user):
+                res = app.patch_json_api(
+                    url,
+                    {
+                        'data': {
+                            'id': preprint_unpublished._id,
+                            'type': 'preprints',
+                            'attributes': {
+                                'is_published': True
                             }
-                        },
-                        auth=user.auth
-                    )
+                        }
+                    },
+                    auth=user.auth
+                )
         assert res.status_code == 200
         assert contributor_added in mock_signal.signals_sent()
         assert mock_update.called

osf/models/schema_response.py

@@ -474,6 +474,8 @@ def _notify_users(self, event, event_initiator):
         if self.state is ApprovalStates.PENDING_MODERATION:
             email_context = notifications.get_email_template_context(resource=self.parent)
             email_context['revision_id'] = self._id
+            email_context['requester_contributor_names'] = ''.join(
+                self.guid.referent.contributors.values_list('fullname', flat=True)),
             reviews_email_submit_moderators_notifications.send(
                 timestamp=timezone.now(),
                 context=email_context,
@@ -499,10 +501,8 @@ def _notify_users(self, event, event_initiator):
             'pending_moderation': self.state is ApprovalStates.PENDING_MODERATION,
             'domain': DOMAIN,
             'provider': self.parent.provider.name if self.parent.provider else '',
-            'requester_contributor_names': self.parent.contributors.values_list(
-                'fullname',
-                flat=True
-            )
+            'requester_contributor_names': ''.join(
+                self.guid.referent.contributors.values_list('fullname', flat=True)),
         }
         for contributor, _ in self.parent.get_active_contributors_recursive(unique_users=True):
             event_context.update(

tests/utils.py

@@ -413,7 +413,7 @@ def assert_emails(mailhog_messages, notifications):
         expected_reciver.append(item['kwargs']['user'].username)
         expected = _render_email_html(
             NotificationType.objects.get(name=item['type']),
-            item['context']
+            item['kwargs']['event_context']
         )
 
         expected_html.append(normalize(expected).rstrip('\n'))

website/reviews/listeners.py

@@ -79,7 +79,7 @@ def reviews_submit_notification_moderators(self, timestamp, resource, context):
             context['message'] = f'submitted "{resource.title}".'
 
     from osf.models import NotificationType
-    context['requester_contributor_names'] = resource.contributors.values_list('fullname', flat=True)
+    context['requester_contributor_names'] = ''.join(resource.contributors.values_list('fullname', flat=True))
     context['localized_timestamp'] = str(timezone.now())
 
     for recipient in resource.provider.get_group('moderator').user_set.all():