fix more sanctions tests

Author: Johnetordoff

api_tests/users/views/test_user_actions.py

@@ -260,10 +260,12 @@ def test_valid_transitions(
                 preprint.date_last_transitioned = None
                 preprint.save()
                 payload = self.create_payload(preprint._id, trigger=trigger)
-                with capture_notifications():
+                if trigger == 'submit':
+                    with capture_notifications():
+                        res = app.post_json_api(url, payload, auth=moderator.auth)
+                else:
                     res = app.post_json_api(url, payload, auth=moderator.auth)
                 assert res.status_code == 201
-
                 action = preprint.actions.order_by('-created').first()
                 assert action.trigger == trigger
 

osf/models/sanctions.py

@@ -565,6 +565,7 @@ def _email_template_context(self,
             })
         else:
             context.update({
+                'domain': osf_settings.DOMAIN,
                 'user_fullname': user.fullname,
                 'initiated_by_fullname': self.initiated_by.fullname,
                 'registration_link': registration_link,
@@ -574,7 +575,9 @@ def _email_template_context(self,
                 'reviewable_title': self._get_registration().title,
                 'reviewable__id': self._get_registration()._id,
                 'reviewable_absolute_url': self._get_registration().absolute_url,
-
+                'reviewable_provider_name': self._get_registration().provider.name,
+                'reviewable_provider__id': self._get_registration().provider._id,
+                'reviewable_provider': self._get_registration().provider.name,
                 'reviewable_registered_from_absolute_url': self._get_registration().registered_from.absolute_url,
                 'reviewable_withdrawal_justification': self._get_registration().withdrawal_justification,
                 'reviewable_branched_from_node': self._get_registration().branched_from_node
@@ -890,6 +893,7 @@ def _email_template_context(self, user, node, is_authorizer=False, urls=None):
                 'reviewable_absolute_url': self._get_registration().absolute_url,
                 'reviewable_branched_from_node': self._get_registration().branched_from_node,
                 'reviewable_provider_name': self._get_registration().provider.name,
+                'reviewable_provider__id': self._get_registration().provider._id,
                 'approval_time_span': approval_time_span,
                 'reviewable_registered_from_absolute_url': self._get_registration().registered_from.absolute_url,
             })
@@ -1054,6 +1058,7 @@ def _email_template_context(self, user, node, is_authorizer=False, urls=None):
             })
         else:
             context.update({
+                'domain': osf_settings.DOMAIN,
                 'initiated_by_fullname': self.initiated_by.fullname,
                 'project_name': self.target_registration.title,
                 'registration_link': registration_link,

osf_tests/test_node.py

@@ -421,7 +421,8 @@ def test_template_has_no_parent(self, template):
         assert template.parent_node is None
 
     def test_template_has_correct_affiliations(self, user, auth, project_with_affiliations):
-        template = project_with_affiliations.use_as_template(auth=auth)
+        with capture_notifications():
+            template = project_with_affiliations.use_as_template(auth=auth)
         user_affiliations = user.get_institution_affiliations().values_list('institution__id', flat=True)
         project_affiliations = project_with_affiliations.affiliated_institutions.values_list('id', flat=True)
         template_affiliations = template.affiliated_institutions.values_list('id', flat=True)
@@ -4187,7 +4188,8 @@ def test_template_security(self, user, auth, project, pointee, component, subpro
         visible_nodes = [x for x in project.nodes if x.can_view(other_user_auth)]
 
         # create templated node
-        new = project.use_as_template(auth=other_user_auth)
+        with capture_notifications():
+            new = project.use_as_template(auth=other_user_auth)
 
         assert new.title == self._default_title(project)
 

osf_tests/test_sanctions.py

@@ -214,7 +214,8 @@ def test_moderated_sanction__no_identifier_created_until_moderator_approval(self
         provider.get_group('moderator').user_set.add(moderator)
 
         # Admin approval
-        registration.sanction.accept()
+        with capture_notifications():
+            registration.sanction.accept()
         assert not registration.get_identifier(category='doi')
 
         # Moderator approval

tests/test_registrations/test_retractions.py

@@ -877,16 +877,17 @@ def test_valid_POST_retraction_adds_to_parent_projects_log(self):
         assert self.registration.registered_from.logs.count() == initial_project_logs + 1
 
     def test_valid_POST_retraction_when_pending_retraction_raises_400(self):
-        self.app.post(
-            self.retraction_post_url,
-            json={'justification': ''},
-            auth=self.user.auth,
-        )
-        res = self.app.post(
-            self.retraction_post_url,
-            json={'justification': ''},
-            auth=self.user.auth,
-        )
+        with capture_notifications():
+            self.app.post(
+                self.retraction_post_url,
+                json={'justification': ''},
+                auth=self.user.auth,
+            )
+            res = self.app.post(
+                self.retraction_post_url,
+                json={'justification': ''},
+                auth=self.user.auth,
+            )
         assert res.status_code == 400
 
     def test_valid_POST_calls_send_mail_with_username(self):

website/templates/pending_embargo_admin.html.mako

@@ -17,11 +17,11 @@
     % if is_moderated:
       If approved by all admin contributors, the registration will be submitted for moderator review.
       If the moderators approve, the registration will be embargoed until
-      ${embargo_end_date.date()}, at which time it will be made public as part of the
+      ${embargo_end_date}, at which time it will be made public as part of the
       <a href="${domain}/registries/${reviewable_provider__id if reviewable_provider__id else 'osf'}">${reviewable_provider_name if reviewable_provider__id else "OSF Registry"}</a>.
     % else:
       If approved by all admin contributors, the registration will be embargoed until
-      ${embargo_end_date.date()}, at which point it will be made public as part of the
+      ${embargo_end_date}, at which point it will be made public as part of the
       <a href="${domain}/registries/${reviewable_provider__id if reviewable_provider__id else 'osf'}">${reviewable_provider_name if reviewable_provider__id else "OSF Registry"}</a>.
     % endif
     </p>