[ENG-8823] Migration Improvements for notification refator

admin_tests/nodes/test_views.py

@@ -602,14 +602,14 @@ def setUp(self):
         self.contr1 = UserFactory()
         self.contr2 = UserFactory()
         self.contr3 = UserFactory()
-
-        pre_moderation_draft = DraftRegistrationFactory(
-            title='pre-moderation-registration',
-            description='some description',
-            registration_schema=get_default_metaschema(),
-            provider=RegistrationProviderFactory(reviews_workflow='pre-moderation'),
-            creator=self.user
-        )
+        with capture_notifications():
+            pre_moderation_draft = DraftRegistrationFactory(
+                title='pre-moderation-registration',
+                description='some description',
+                registration_schema=get_default_metaschema(),
+                provider=RegistrationProviderFactory(reviews_workflow='pre-moderation'),
+                creator=self.user
+            )
         self._add_contributor(pre_moderation_draft, permissions.ADMIN, self.contr1)
         self._add_contributor(pre_moderation_draft, permissions.ADMIN, self.contr2)
         self._add_contributor(pre_moderation_draft, permissions.ADMIN, self.contr3)

api/subscriptions/serializers.py

@@ -25,14 +25,13 @@ class SubscriptionSerializer(JSONAPISerializer):
         source='message_frequency',
         required=True,
     )
-
-    class Meta:
-        type_ = 'subscription'
-
     links = LinksField({
         'self': 'get_absolute_url',
     })
 
+    class Meta:
+        type_ = 'subscription'
+
     def get_absolute_url(self, obj):
         return obj.absolute_api_v2_url
 

api_tests/draft_nodes/views/test_draft_node_detail.py

@@ -7,6 +7,7 @@
     AuthUserFactory,
     ProjectFactory
 )
+from tests.utils import capture_notifications
 
 
 @pytest.mark.django_db
@@ -21,7 +22,8 @@ def user_two(self):
         return AuthUserFactory()
 
     def test_detail_response(self, app, user, user_two):
-        draft_reg = DraftRegistrationFactory(initiator=user)
+        with capture_notifications():
+            draft_reg = DraftRegistrationFactory(initiator=user)
         draft_reg.add_contributor(user_two)
         draft_reg.save()
 

api_tests/draft_nodes/views/test_draft_node_draft_registrations_list.py

@@ -6,6 +6,7 @@
     AuthUserFactory,
 )
 from osf.utils.permissions import WRITE
+from tests.utils import capture_notifications
 
 
 @pytest.mark.django_db
@@ -21,9 +22,10 @@ def user_write_contrib(self):
 
     @pytest.fixture()
     def draft_registration(self, user, user_write_contrib):
-        draft_reg = DraftRegistrationFactory(
-            initiator=user
-        )
+        with capture_notifications():
+            draft_reg = DraftRegistrationFactory(
+                initiator=user
+            )
         draft_reg.add_contributor(
             user_write_contrib,
             permissions=WRITE)

api_tests/draft_nodes/views/test_draft_node_files_lists.py

@@ -18,14 +18,16 @@
 from addons.github.tests.factories import GitHubAccountFactory
 from api.base.utils import waterbutler_api_url_for
 from api_tests import utils as api_utils
+from tests.utils import capture_notifications
 from website import settings
 
 
 class TestDraftNodeProvidersList(ApiTestCase):
     def setUp(self):
         super().setUp()
         self.user = AuthUserFactory()
-        self.draft_reg = DraftRegistrationFactory(creator=self.user)
+        with capture_notifications():
+            self.draft_reg = DraftRegistrationFactory(creator=self.user)
         self.draft_node = self.draft_reg.branched_from
         self.url = f'/{API_BASE}draft_nodes/{self.draft_node._id}/files/'
 
@@ -149,7 +151,8 @@ class TestNodeFilesList(ApiTestCase):
     def setUp(self):
         super().setUp()
         self.user = AuthUserFactory()
-        self.draft_reg = DraftRegistrationFactory(creator=self.user)
+        with capture_notifications():
+            self.draft_reg = DraftRegistrationFactory(creator=self.user)
         self.draft_node = self.draft_reg.branched_from
         self.private_url = '/{}draft_nodes/{}/files/'.format(
             API_BASE, self.draft_node._id)
@@ -489,7 +492,8 @@ class TestNodeFilesListFiltering(ApiTestCase):
     def setUp(self):
         super().setUp()
         self.user = AuthUserFactory()
-        self.draft_reg = DraftRegistrationFactory(creator=self.user)
+        with capture_notifications():
+            self.draft_reg = DraftRegistrationFactory(creator=self.user)
         self.draft_node = self.draft_reg.branched_from
         # Prep HTTP mocks
         prepare_mock_wb_response(
@@ -631,7 +635,8 @@ class TestNodeFilesListPagination(ApiTestCase):
     def setUp(self):
         super().setUp()
         self.user = AuthUserFactory()
-        self.draft_reg = DraftRegistrationFactory(creator=self.user)
+        with capture_notifications():
+            self.draft_reg = DraftRegistrationFactory(creator=self.user)
         self.draft_node = self.draft_reg.branched_from
 
     def add_github(self):
@@ -703,7 +708,8 @@ class TestDraftNodeStorageProviderDetail(ApiTestCase):
     def setUp(self):
         super().setUp()
         self.user = AuthUserFactory()
-        self.draft_reg = DraftRegistrationFactory(initiator=self.user)
+        with capture_notifications():
+            self.draft_reg = DraftRegistrationFactory(initiator=self.user)
         self.draft_node = self.draft_reg.branched_from
         self.private_url = '/{}draft_nodes/{}/files/providers/osfstorage/'.format(
             API_BASE, self.draft_node._id)

api_tests/draft_registrations/views/test_draft_registration_contributor_detail.py

@@ -14,6 +14,7 @@
     AuthUserFactory
 )
 from osf.utils import permissions
+from tests.utils import capture_notifications
 
 
 @pytest.fixture()
@@ -41,9 +42,10 @@ def project_public(self, user, title, description, category):
     @pytest.fixture()
     def project_private(self, user, title, description, category):
         # Defining "private project" as a draft reg, overriding TestContributorDetail
-        draft = DraftRegistrationFactory(
-            initiator=user,
-        )
+        with capture_notifications():
+            draft = DraftRegistrationFactory(
+                initiator=user,
+            )
         return draft
 
     @pytest.fixture()
@@ -108,7 +110,8 @@ class TestDraftContributorOrdering(TestNodeContributorOrdering):
     @pytest.fixture()
     def project(self, user, contribs):
         # Overrides TestNodeContributorOrdering
-        project = DraftRegistrationFactory(initiator=user, title='hey')
+        with capture_notifications():
+            project = DraftRegistrationFactory(initiator=user, title='hey')
         for contrib in contribs:
             if contrib._id != user._id:
                 project.add_contributor(
@@ -145,7 +148,8 @@ class TestDraftRegistrationContributorUpdate(TestNodeContributorUpdate):
     @pytest.fixture()
     def project(self, user, contrib):
         # Overrides TestNodeContributorUpdate
-        draft = DraftRegistrationFactory(creator=user)
+        with capture_notifications():
+            draft = DraftRegistrationFactory(creator=user)
         draft.add_contributor(
             contrib,
             permissions=permissions.WRITE,
@@ -175,12 +179,14 @@ def contrib(self):
     @pytest.fixture()
     def project(self, user, contrib):
         # Overrides TestNodeContributorPartialUpdate
-        project = DraftRegistrationFactory(creator=user)
-        project.add_contributor(
-            contrib,
-            permissions=permissions.WRITE,
-            visible=True,
-            save=True)
+        with capture_notifications():
+            project = DraftRegistrationFactory(creator=user)
+            project.add_contributor(
+                contrib,
+                permissions=permissions.WRITE,
+                visible=True,
+                save=True
+            )
         return project
 
     @pytest.fixture()
@@ -226,7 +232,8 @@ class TestDraftContributorDelete(TestNodeContributorDelete):
     @pytest.fixture()
     def project(self, user, user_write_contrib):
         # Overrides TestNodeContributorDelete
-        project = DraftRegistrationFactory(creator=user)
+        with capture_notifications():
+            project = DraftRegistrationFactory(creator=user)
         project.add_contributor(
             user_write_contrib,
             permissions=permissions.WRITE,
@@ -265,7 +272,8 @@ def user_non_biblio_contrib(self):
     @pytest.fixture()
     def draft_registration(self, user, user_non_biblio_contrib):
         # Overrides TestNodeContributorDelete
-        project = DraftRegistrationFactory(creator=user)
+        with capture_notifications():
+            project = DraftRegistrationFactory(creator=user)
         project.add_contributor(
             user,
             permissions=permissions.ADMIN,

api_tests/draft_registrations/views/test_draft_registration_contributor_list.py

@@ -49,12 +49,13 @@ def project_public(self, user, title, description, category):
 
     @pytest.fixture()
     def project_private(self, user, title, description, category):
-        return DraftRegistrationFactory(
-            title=title,
-            description=description,
-            category=category,
-            initiator=user
-        )
+        with capture_notifications():
+            return DraftRegistrationFactory(
+                title=title,
+                description=description,
+                category=category,
+                initiator=user
+            )
 
 
 class TestDraftRegistrationContributorList(DraftRegistrationCRUDTestCase, TestNodeContributorList):
@@ -338,9 +339,10 @@ class TestDraftContributorBulkUpdated(DraftRegistrationCRUDTestCase, TestNodeCon
     def project_public(
             self, user, user_two, user_three, title,
             description, category):
-        project_public = DraftRegistrationFactory(
-            initiator=user
-        )
+        with capture_notifications():
+            project_public = DraftRegistrationFactory(
+                initiator=user
+            )
         project_public.add_contributor(
             user_two,
             permissions=permissions.READ,
@@ -355,9 +357,13 @@ def project_public(
     def project_private(
             self, user, user_two, user_three,
             title, description, category):
-        project_private = DraftRegistrationFactory(
-            initiator=user
-        )
+
+        try:
+            with capture_notifications():
+                project_private = DraftRegistrationFactory(initiator=user)
+        except AssertionError:  # No message sent
+            project_private = DraftRegistrationFactory(initiator=user)
+
         project_private.add_contributor(
             user_two,
             permissions=permissions.READ,
@@ -382,9 +388,10 @@ class TestDraftRegistrationContributorBulkPartialUpdate(DraftRegistrationCRUDTes
     def project_public(
             self, user, user_two, user_three, title,
             description, category):
-        project_public = DraftRegistrationFactory(
-            initiator=user
-        )
+        with capture_notifications():
+            project_public = DraftRegistrationFactory(
+                initiator=user
+            )
         project_public.add_contributor(
             user_two,
             permissions=permissions.READ,
@@ -399,9 +406,11 @@ def project_public(
     def project_private(
             self, user, user_two, user_three,
             title, description, category):
-        project_private = DraftRegistrationFactory(
-            initiator=user
-        )
+        try:
+            with capture_notifications():
+                project_private = DraftRegistrationFactory(initiator=user)
+        except AssertionError:  # No message sent
+            project_private = DraftRegistrationFactory(initiator=user)
         project_private.add_contributor(
             user_two,
             permissions=permissions.READ,
@@ -436,9 +445,10 @@ def url_private(self, project_private):
     def project_public(
             self, user, user_two, user_three, title,
             description, category):
-        project_public = DraftRegistrationFactory(
-            initiator=user
-        )
+        with capture_notifications():
+            project_public = DraftRegistrationFactory(
+                initiator=user
+            )
         project_public.add_contributor(
             user_two,
             permissions=permissions.READ,
@@ -453,9 +463,11 @@ def project_public(
     def project_private(
             self, user, user_two, user_three,
             title, description, category):
-        project_private = DraftRegistrationFactory(
-            initiator=user
-        )
+        try:
+            with capture_notifications():
+                project_private = DraftRegistrationFactory(initiator=user)
+        except AssertionError:  # No message sent
+            project_private = DraftRegistrationFactory(initiator=user)
         project_private.add_contributor(
             user_two,
             permissions=permissions.READ,
@@ -472,7 +484,8 @@ def project_private(
 class TestDraftRegistrationContributorFiltering(DraftRegistrationCRUDTestCase, TestNodeContributorFiltering):
     @pytest.fixture()
     def project(self, user):
-        return DraftRegistrationFactory(initiator=user)
+        with capture_notifications():
+            return DraftRegistrationFactory(initiator=user)
 
     @pytest.fixture()
     def url(self, project):