fix template tests

Author: Johnetordoff

api/institutions/authentication.py

@@ -355,6 +355,7 @@ def authenticate(self, request):
             ).emit(
                 user=user,
                 event_context={
+                    'user_fullname': user.fullname,
                     'email_to_add': email_to_add,
                     'domain': DOMAIN,
                     'osf_support_email': OSF_SUPPORT_EMAIL,

api/nodes/views.py

@@ -1051,6 +1051,7 @@ def perform_create(self, serializer):
                 user=user,
                 subscribed_object=node,
                 event_context={
+                    'domain': settings.DOMAIN,
                     'guid': fork._id,
                     'node_title': node.title,
                     'node__id': node._id,
@@ -1065,6 +1066,7 @@ def perform_create(self, serializer):
                 user=user,
                 subscribed_object=node,
                 event_context={
+                    'domain': settings.DOMAIN,
                     'guid': fork._id,
                     'node_title': node.title,
                     'node__id': node._id,

osf_tests/metadata/test_osf_gathering.py

@@ -101,9 +101,9 @@ def setUpTestData(cls):
             creator=cls.user__admin,
             is_public=True,
         )
-        cls.preprint.add_contributor(cls.user__readwrite, permissions=permissions.WRITE)
-        cls.preprint.add_contributor(cls.user__readonly, permissions=permissions.READ)
-        cls.preprint.add_contributor(cls.user__invisible, permissions=permissions.WRITE, visible=False)
+        cls.preprint.add_contributor(cls.user__readwrite, permissions=permissions.WRITE, notification_type=False)
+        cls.preprint.add_contributor(cls.user__readonly, permissions=permissions.READ, notification_type=False)
+        cls.preprint.add_contributor(cls.user__invisible, permissions=permissions.WRITE, visible=False, notification_type=False)
         cls.registration_cedar_record = factories.CedarMetadataRecordFactory(
             template=cls.cedar_template,
             is_published=True,

website/templates/emails/confirm_moderation.html.mako

@@ -5,15 +5,15 @@
   <td style="border-collapse: collapse;">
     Hello ${user_fullname},<br>
     <br>
-    You have been added by ${referrer_fullname}, as ${'an administrator' if is_admin else 'a moderator'} to ${provider.name}, powered by OSF. To set a password for your account, visit:<br>
+    You have been added by ${referrer_fullname}, as ${'an administrator' if is_admin else 'a moderator'} to ${provider_name}, powered by OSF. To set a password for your account, visit:<br>
     <br>
     ${claim_url}<br>
     <br>
-    Once you have set a password you will be able to moderate, create and approve your own submissions. You will automatically be subscribed to notification emails for new submissions to ${provider.name}.<br>
+    Once you have set a password you will be able to moderate, create and approve your own submissions. You will automatically be subscribed to notification emails for new submissions to ${provider_name}.<br>
     <br>
-    If you are not ${user_fullname} or you have been erroneously associated with ${provider.name}, email contact+${provider._id}@osf.io with the subject line "Claiming error" to report the problem.<br>
+    If you are not ${user_fullname} or you have been erroneously associated with ${provider_name}, email contact+${provider__id}@osf.io with the subject line "Claiming error" to report the problem.<br>
     <br>
     Sincerely,<br>
-    Your ${provider.name} and OSF teams<br>
+    Your ${provider_name} and OSF teams<br>
 </tr>
 </%def>

website/templates/emails/moderator_added.html.mako

@@ -5,14 +5,14 @@
   <td style="border-collapse: collapse;">
     Hello ${user_fullname},<br>
     <br>
-    You have been added by ${referrer_fullname} as ${'an administrator' if is_admin else 'a moderator'} to ${provider.name}, powered by OSF.<br>
+    You have been added by ${referrer_fullname} as ${'an administrator' if is_admin else 'a moderator'} to ${provider_name}, powered by OSF.<br>
     <br>
-    You will automatically be subscribed to notification emails for new submissions to ${provider.name}.<br>
+    You will automatically be subscribed to notification emails for new submissions to ${provider_name}.<br>
     <br>
-    If you are not ${user_fullname} or you have been erroneously associated with ${provider.name}, email contact+${provider._id}@osf.io with the subject line "Claiming Error" to report the problem.<br>
+    If you are not ${user_fullname} or you have been erroneously associated with ${provider_name}, email contact+${provider__id}@osf.io with the subject line "Claiming Error" to report the problem.<br>
     <br>
     Sincerely,<br>
     <br>
-    Your ${provider.name} and OSF teams<br>
+    Your ${provider_name} and OSF teams<br>
 </tr>
 </%def>

website/templates/project/project.mako

@@ -550,15 +550,15 @@
                                 % if preprint['state'] == 'pending':
                                     % if preprint['provider']['workflow'] == 'post-moderation':
                                         <% icon_tooltip = 'This {preprint_word} is publicly available and searchable but is subject to' \
-                                        ' removal by a moderator.'.format(preprint_word=preprint['word'])%>
+                                        ' removal by a moderator.'%>
                                     % else:
                                         <% icon_tooltip = 'This {preprint_word} is not publicly available or searchable until approved ' \
-                                        'by a moderator.'.format(preprint_word=preprint['word'])%>
+                                        'by a moderator.' %>
                                     % endif
                                 % elif preprint['state'] == 'accepted':
-                                    <% icon_tooltip = 'This {preprint_word} is publicly available and searchable.'.format(preprint_word=preprint['word'])%>
+                                    <% icon_tooltip = 'This {preprint_word} is publicly available and searchable.' %>
                                 % else:
-                                    <% icon_tooltip = 'This {preprint_word} is not publicly available or searchable.'.format(preprint_word=preprint['word'])%>
+                                    <% icon_tooltip = 'This {preprint_word} is not publicly available or searchable.' %>
                                 % endif
                                 <i class="fa fa-question-circle text-muted" data-toggle="tooltip" data-placement="bottom" title="${icon_tooltip}"></i>
                             % endif