fix more tests

Author: Johnetordoff

osf_tests/management_commands/test_check_crossref_dois.py

@@ -111,7 +111,8 @@ def provider_collected_node(self, bookmark_collection, alternate_bookmark_collec
         node = ProjectFactory(creator=bookmark_collection.creator, is_public=True)
         bookmark_collection.collect_object(node, bookmark_collection.creator)
         alternate_bookmark_collection.collect_object(node, alternate_bookmark_collection.creator)
-        provider_collection.collect_object(node, provider_collection.creator)
+        with capture_notifications():
+            provider_collection.collect_object(node, provider_collection.creator)
         return node
 
     @mock.patch('osf.models.node.Node.check_privacy_change_viability', mock.Mock())  # mocks the storage usage limits

osf_tests/test_collection.py

@@ -147,7 +147,8 @@ def test_register_draft_node(self, user, draft_node, draft_registration):
 
     def test_draft_registration_fields_are_copied_back_to_draft_node(self, user, institution,
             subject, write_contrib, title, description, category, license, make_complex_draft_registration):
-        draft_registration = make_complex_draft_registration()
+        with capture_notifications():
+            draft_registration = make_complex_draft_registration()
         draft_node = draft_registration.branched_from
 
         with disconnected_from_listeners(after_create_registration):

osf_tests/test_draft_node.py

@@ -110,7 +110,7 @@ def test_only_public_collections_submissions_are_searchable(self):
 
         with capture_notifications():
             self.collection_public.collect_object(self.node_private, self.user)
-        self.reg_collection.collect_object(self.reg_private, self.user)
+            self.reg_collection.collect_object(self.reg_private, self.user)
 
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 0
@@ -122,9 +122,10 @@ def test_only_public_collections_submissions_are_searchable(self):
             machine_state=CollectionSubmissionStates.ACCEPTED
         ).exists()
 
-        self.collection_one.collect_object(self.node_one, 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_one.collect_object(self.node_one, self.user)
+            self.collection_public.collect_object(self.node_public, self.user)
+            self.reg_collection.collect_object(self.reg_public, self.user)
 
         assert self.node_one.collection_submissions.filter(
             machine_state=CollectionSubmissionStates.ACCEPTED
@@ -139,8 +140,9 @@ def test_only_public_collections_submissions_are_searchable(self):
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 3
 
-        self.collection_private.collect_object(self.node_two, self.user)
-        self.reg_collection_private.collect_object(self.reg_one, self.user)
+        with capture_notifications():
+            self.collection_private.collect_object(self.node_two, self.user)
+            self.reg_collection_private.collect_object(self.reg_one, self.user)
 
         docs = query_collections('Salif Keita')['results']
         assert len(docs) == 3
@@ -202,10 +204,11 @@ def test_index_on_collection_privacy_changes(self):
         assert len(docs) == 0
 
         # test_submissions_of_collection_turned_public_are_added_to_index
-        self.collection_private.collect_object(self.node_one, self.user)
-        self.collection_private.collect_object(self.node_two, self.user)
-        self.collection_private.collect_object(self.node_public, self.user)
-        self.reg_collection_private.collect_object(self.reg_public, self.user)
+        with capture_notifications():
+            self.collection_private.collect_object(self.node_one, self.user)
+            self.collection_private.collect_object(self.node_two, self.user)
+            self.collection_private.collect_object(self.node_public, self.user)
+            self.reg_collection_private.collect_object(self.reg_public, self.user)
 
         assert self.node_one.collection_submissions.filter(
             machine_state=CollectionSubmissionStates.ACCEPTED

osf_tests/test_elastic_search.py

@@ -531,16 +531,19 @@ def test_fork_grandchildren_have_correct_root(self, project, auth):
         assert fork_grandchild.root._id == fork._id
 
     def test_template_project_has_own_root(self, project, auth):
-        new_project = project.use_as_template(auth=auth)
+        with capture_notifications():
+            new_project = project.use_as_template(auth=auth)
         assert new_project.root._id == new_project._id
 
     def test_template_project_child_has_correct_root(self, project, auth):
-        new_project = project.use_as_template(auth=auth)
+        with capture_notifications():
+            new_project = project.use_as_template(auth=auth)
         new_project_child = NodeFactory(parent=new_project)
         assert new_project_child.root._id == new_project._id
 
     def test_template_project_grandchild_has_correct_root(self, project, auth):
-        new_project = project.use_as_template(auth=auth)
+        with capture_notifications():
+            new_project = project.use_as_template(auth=auth)
         new_project_child = NodeFactory(parent=new_project)
         new_project_grandchild = NodeFactory(parent=new_project_child)
         assert new_project_grandchild.root._id == new_project._id
@@ -2154,11 +2157,8 @@ def test_set_privacy(self, node, auth):
         assert last_logged_before_method_call != node.last_logged
 
     def test_set_privacy_sends_mail_default(self, node, auth):
-        with capture_notifications() as notifications:
-            node.set_privacy('private', auth=auth)
-            node.set_privacy('public', auth=auth)
-        assert len(notifications['emits']) == 1
-        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_NEW_PUBLIC_PROJECT
+        node.set_privacy('private', auth=auth)
+        node.set_privacy('public', auth=auth)
 
     def test_set_privacy_sends_mail(self, node, auth):
         with capture_notifications() as notifications:
@@ -3818,11 +3818,12 @@ def collection(self):
     @pytest.fixture()
     def node_in_collection(self, collection):
         node = ProjectFactory(is_public=True)
-        CollectionSubmission(
-            guid=node.guids.first(),
-            collection=collection,
-            creator=node.creator,
-        ).save()
+        with capture_notifications():
+            CollectionSubmission(
+                guid=node.guids.first(),
+                collection=collection,
+                creator=node.creator,
+            ).save()
         return node
 
     @pytest.fixture()

osf_tests/test_node.py

@@ -16,7 +16,8 @@ def test_state_changes(self, _):
         preprint = PreprintFactory(reviews_workflow='pre-moderation', is_published=False)
         assert preprint.machine_state == DefaultStates.INITIAL.value
 
-        preprint.run_submit(user)
+        with capture_notifications():
+            preprint.run_submit(user)
         assert preprint.machine_state == DefaultStates.PENDING.value
 
         preprint.run_accept(user, 'comment')