fix submissions flow tests

Author: Johnetordoff

api_tests/preprints/views/test_preprint_list.py

@@ -376,8 +376,7 @@ def manual_guid_payload(self):
     def test_fail_create_prerprint_with_manual_guid(self):
         public_project_payload = build_preprint_create_payload(self.public_project._id, self.provider._id, attrs=self.manual_guid_payload)
         res = self.app.post_json_api(self.url, public_project_payload, auth=self.user.auth, expect_errors=True)
-        assert res.status_code == 400
-        print(res.status_code)
+        assert res.status_code == 403
 
     def test_create_preprint_with_manual_guid(self):
         public_project_payload = build_preprint_create_payload(self.public_project._id, self.provider._id, attrs=self.manual_guid_payload)
@@ -513,7 +512,7 @@ def test_no_provider_given(self):
         no_providers_payload = build_preprint_create_payload()
         res = self.app.post_json_api(self.url, no_providers_payload, auth=self.user.auth, expect_errors=True)
 
-        assert res.status_code == 400
+        assert res.status_code == 403
         assert res.json['errors'][0]['detail'] == 'You must specify a valid provider to create a preprint.'
 
     def test_invalid_provider_given(self):

api_tests/registrations/views/test_registration_list.py

@@ -1936,7 +1936,8 @@ def test_bulk_update_embargo_logged_in_contrib(
         assert registration_one.is_pending_embargo_termination is False
         assert registration_two.is_pending_embargo_termination is False
 
-        res = app.put_json_api(url, public_payload, auth=user.auth, bulk=True)
+        with capture_notifications():
+            res = app.put_json_api(url, public_payload, auth=user.auth, bulk=True)
         assert res.status_code == 200
         assert ({registration_one._id, registration_two._id} == {
                 res.json['data'][0]['id'], res.json['data'][1]['id']})
@@ -2025,7 +2026,8 @@ def update_contributor_attribute_request(self, auth_user, contributor, permissio
         return self.app.patch_json_api(url, payload, auth=auth_user.auth, expect_errors=expect_errors)
 
     def test_add_contributor(self):
-        res = self.add_contributor_request(auth_user=self.user, contributor=self.contributor)
+        with capture_notifications():
+            res = self.add_contributor_request(auth_user=self.user, contributor=self.contributor)
         assert res.status_code == 201
         assert res.json['data']['embeds']['users']['data']['id'] == self.contributor._id
         assert self.contributor.groups.filter(name__icontains=f'{self.public_registration.id}_write').exists()
@@ -2051,7 +2053,8 @@ def test_add_contributor(self):
         assert self.contributor.groups.filter(name__icontains=f'{self.public_registration.id}_read').exists() is False
 
     def test_remove_contributor(self):
-        self.add_contributor_request(self.user, self.contributor)
+        with capture_notifications():
+            self.add_contributor_request(self.user, self.contributor)
         res = self.remove_contributor_request(self.user, self.contributor)
         assert res.status_code == 204
         assert self.contributor.groups.exists() is False
@@ -2063,11 +2066,12 @@ def test_remove_contributor(self):
 
     def test_contributor_can_edit_title_if_has_permission(self):
         TITLE = 'New Title'
-        self.add_contributor_request(
-            auth_user=self.user,
-            contributor=self.contributor,
-            permission='read'
-        )
+        with capture_notifications():
+            self.add_contributor_request(
+                auth_user=self.user,
+                contributor=self.contributor,
+                permission='read'
+            )
         res = self.update_registration_attribute_request(
             auth_user=self.contributor,
             expect_errors=True,
@@ -2091,17 +2095,17 @@ def test_contributor_cannot_edit_contributors(self):
         for permission in ['read', 'write']:
             contributor_to_add = AuthUserFactory()
             contributor_to_remove = AuthUserFactory()
-            self.add_contributor_request(
-                auth_user=self.user,
-                contributor=self.contributor,
-                permission=permission
-            )
-            self.add_contributor_request(
-                auth_user=self.user,
-                contributor=contributor_to_remove,
-                permission=permission
-            )
             with capture_notifications():
+                self.add_contributor_request(
+                    auth_user=self.user,
+                    contributor=self.contributor,
+                    permission=permission
+                )
+                self.add_contributor_request(
+                    auth_user=self.user,
+                    contributor=contributor_to_remove,
+                    permission=permission
+                )
                 res = self.add_contributor_request(
                     auth_user=self.contributor,
                     contributor=contributor_to_add,
@@ -2120,11 +2124,12 @@ def test_contributor_cannot_edit_contributors(self):
             self.remove_contributor_request(self.user, contributor_to_remove)
 
     def test_only_admin_can_update_permissions_and_bibliographic_status(self):
-        self.add_contributor_request(
-            auth_user=self.user,
-            contributor=self.contributor,
-            permission='read'
-        )
+        with capture_notifications():
+            self.add_contributor_request(
+                auth_user=self.user,
+                contributor=self.contributor,
+                permission='read'
+            )
         res = self.update_contributor_attribute_request(
             self.user,
             self.contributor,

osf/models/collection_submission.py

@@ -217,6 +217,9 @@ def _notify_moderated_rejected(self, event_data):
                     'requester_fullname': event_data.kwargs.get('user').fullname,
                     'is_admin': self.guid.referent.has_permission(contributor, ADMIN),
                     'collection_title': self.collection.title,
+                    'collection_provider_name': self.collection.provider.name,
+                    'collections_link': DOMAIN + 'collections/' + self.collection.provider._id,
+                    'node_absolute_url': self.guid.referent.get_absolute_url(),
                     'profile_image_url': contributor.profile_image_url(),
                     'message': f'submission of "{self.collection.title} was rejected',
                     'node_title': self.guid.referent.title,
@@ -254,6 +257,7 @@ def _notify_removed(self, event_data):
 
         event_context_base = {
             'remover_fullname': user.fullname,
+            'remover_absolute_url': user.get_absolute_url(),
             'requester_fullname': user.fullname,
             'collection_id': self.collection.id,
             'collection_title': self.collection.title,
@@ -293,6 +297,13 @@ def _notify_removed(self, event_data):
                         'is_admin': node.has_permission(contributor, ADMIN),
                         'rejection_justification': event_data.kwargs.get('comment'),
                         'collections_title': self.collection.title,
+                        'collection_provider_name': self.collection.provider.name,
+                        'collection_provider__id': self.collection.provider._id,
+                        'remover_absolute_url': user.get_absolute_url() if user is not None else None,
+                        'node_absolute_url': node.absolute_url,
+                        'collection_provider': self.collection.provider.name,
+                        'collections_link': DOMAIN + 'collections/' + self.collection.provider._id,
+                        'user_fullname': contributor.fullname,
                         'is_request_email': False,
                         'message': '',
                         'localized_timestamp': str(timezone.now()),
@@ -308,7 +319,13 @@ def _notify_removed(self, event_data):
                         'requester_contributor_names': ''.join(
                             self.guid.referent.contributors.values_list('fullname', flat=True)),
                         'localized_timestamp': str(timezone.now()),
+                        'user_fullname': contributor.fullname,
                         'collections_title': self.collection.title,
+                        'collection_provider_name': self.collection.provider.name,
+                        'collection_provider__id': self.collection.provider._id,
+                        'collection_provider': self.collection.provider.name,
+                        'collections_link': DOMAIN + 'collections/' + self.collection.provider._id,
+                        'node_absolute_url': node.get_absolute_url(),
                         'is_request_email': False,
                         'message': '',
                         'is_admin': node.has_permission(contributor, ADMIN),
@@ -373,6 +390,8 @@ def _notify_cancel(self, event_data):
                     'collections_link': collections_link,
                     'collection_title': self.collection.title,
                     'collection_provider_name': collection_provider_name,
+                    'node_absolute_url"': node.get_absolute_url(),
+                    'collection_provider': collection_provider_name,
                     'domain': settings.DOMAIN,
                     'is_request_email': False,
                     'message': '',

osf/models/sanctions.py

@@ -557,6 +557,7 @@ def _email_template_context(self,
                 'reviewable__id': self._get_registration()._id,
                 'reviewable_absolute_url': self._get_registration().absolute_url,
                 'reviewable_provider_name': self._get_registration().provider.name,
+                'reviewable_provider': self._get_registration().provider.name,
                 'reviewable_provider__id': self._get_registration().provider._id,
                 'reviewable_registered_from_absolute_url': self._get_registration().registered_from.absolute_url,
                 'reviewable_withdrawal_justification': self._get_registration().withdrawal_justification,

osf_tests/test_elastic_search.py

@@ -108,7 +108,8 @@ def test_only_public_collections_submissions_are_searchable(self):
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 0
 
-        self.collection_public.collect_object(self.node_private, self.user)
+        with capture_notifications():
+            self.collection_public.collect_object(self.node_private, self.user)
         self.reg_collection.collect_object(self.reg_private, self.user)
 
         docs = query_collections('Salif Keita')['results']
@@ -149,8 +150,9 @@ def test_index_on_submission_privacy_changes(self):
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 0
 
-        self.collection_public.collect_object(self.node_one, self.user)
-        self.collection_one.collect_object(self.node_one, self.user)
+        with capture_notifications():
+            self.collection_public.collect_object(self.node_one, self.user)
+            self.collection_one.collect_object(self.node_one, self.user)
 
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 2
@@ -163,7 +165,8 @@ def test_index_on_submission_privacy_changes(self):
         assert len(docs) == 0
 
         # test_submissions_turned_public_are_added_to_index
-        self.collection_public.collect_object(self.node_private, self.user)
+        with capture_notifications():
+            self.collection_public.collect_object(self.node_private, self.user)
 
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 0
@@ -180,10 +183,11 @@ def test_index_on_collection_privacy_changes(self):
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 0
 
-        self.collection_public.collect_object(self.node_one, self.user)
-        self.collection_public.collect_object(self.node_two, self.user)
-        self.collection_public.collect_object(self.node_public, self.user)
-        self.reg_collection.collect_object(self.reg_public, self.user)
+        with capture_notifications():
+            self.collection_public.collect_object(self.node_one, self.user)
+            self.collection_public.collect_object(self.node_two, self.user)
+            self.collection_public.collect_object(self.node_public, self.user)
+            self.reg_collection.collect_object(self.reg_public, self.user)
 
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 4
@@ -232,10 +236,11 @@ def test_collection_submissions_are_removed_from_index_on_delete(self):
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 0
 
-        self.collection_public.collect_object(self.node_one, self.user)
-        self.collection_public.collect_object(self.node_two, self.user)
-        self.collection_public.collect_object(self.node_public, self.user)
-        self.reg_collection.collect_object(self.reg_public, self.user)
+        with capture_notifications():
+            self.collection_public.collect_object(self.node_one, self.user)
+            self.collection_public.collect_object(self.node_two, self.user)
+            self.collection_public.collect_object(self.node_public, self.user)
+            self.reg_collection.collect_object(self.reg_public, self.user)
 
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 4
@@ -249,8 +254,9 @@ def test_collection_submissions_are_removed_from_index_on_delete(self):
         assert len(docs) == 0
 
     def test_removed_submission_are_removed_from_index(self):
-        self.collection_public.collect_object(self.node_one, self.user)
-        self.reg_collection.collect_object(self.reg_public, self.user)
+        with capture_notifications():
+            self.collection_public.collect_object(self.node_one, self.user)
+            self.reg_collection.collect_object(self.reg_public, self.user)
         assert self.node_one.collection_submissions.filter(
             machine_state=CollectionSubmissionStates.ACCEPTED
         ).exists()